Skip to content
Snippets Groups Projects
Commit dbf62a7d authored by Robert Speicher's avatar Robert Speicher Committed by GitLab Release Tools Bot
Browse files

Merge branch...

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 abe4e325)

df5b7a66 Wait for requests in LFS files spec
parent d0bb16fc
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment