diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-06-21 18:44:10 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-06-29 12:18:23 -0400 |
| commit | e939bf7be10b6ec516ffbe75ad4b4dc1151670a7 (patch) | |
| tree | 7d59f3f1fad2b83c1cd051562d6375fd4bbf0a7a /spec/features/projects/merge_request_button_spec.rb | |
| parent | 5a983ac431affc800d5e9db9e83c14710ec29c36 (diff) | |
| download | gitlab-ce-e939bf7be10b6ec516ffbe75ad4b4dc1151670a7.tar.gz | |
Change gitlab_sign_in to sign_in where possible
Diffstat (limited to 'spec/features/projects/merge_request_button_spec.rb')
| -rw-r--r-- | spec/features/projects/merge_request_button_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb index 58054bbbbed..e8ab482a6e1 100644 --- a/spec/features/projects/merge_request_button_spec.rb +++ b/spec/features/projects/merge_request_button_spec.rb @@ -18,7 +18,7 @@ feature 'Merge Request button', feature: true do context 'logged in as developer' do before do - gitlab_sign_in(user) + sign_in(user) project.team << [user, :developer] end @@ -52,7 +52,7 @@ feature 'Merge Request button', feature: true do context 'logged in as non-member' do before do - gitlab_sign_in(user) + sign_in(user) end it 'does not show Create merge request button' do |