diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-08 19:08:22 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-09 04:43:53 +0300 |
| commit | dbf62a7d1ecca2ae7dbb8c70220cb1ff96431b9c (patch) | |
| tree | 52aeacd44dd09a83d427a1938be61e6d5ad17b2c | |
| parent | d0bb16fcdc38c6491ff48daf139ae41e55b355ca (diff) | |
Merge branch '50224-rails5-duplicate-key-value-violates-unique-constraint-index_gpg_signatures_on_commit_sha' into 'master'
Resolve "[Rails5] duplicate key value violates unique constraint "index_gpg_signatures_on_commit_sha""
Closes #50224
See merge request gitlab-org/gitlab-ce!24226
(cherry picked from commit abe4e325a20435b6cb1ce6d6ba1a8dcd0a82ea14)
df5b7a66 Wait for requests in LFS files spec
| -rw-r--r-- | spec/features/projects/files/user_browses_lfs_files_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/features/projects/files/user_browses_lfs_files_spec.rb b/spec/features/projects/files/user_browses_lfs_files_spec.rb index c559a301ca1..d56476adb05 100644 --- a/spec/features/projects/files/user_browses_lfs_files_spec.rb +++ b/spec/features/projects/files/user_browses_lfs_files_spec.rb @@ -12,6 +12,7 @@ describe 'Projects > Files > User browses LFS files' do before do allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(false) visit project_tree_path(project, 'lfs') + wait_for_requests end it 'is possible to see raw content of LFS pointer' do @@ -26,10 +27,11 @@ describe 'Projects > Files > User browses LFS files' do end end - context 'when LFS is enabled' do + context 'when LFS is enabled', :js do before do allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(true) visit project_tree_path(project, 'lfs') + wait_for_requests end it 'shows an LFS object' do |