diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-21 09:43:58 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-06-21 09:43:58 -0700 |
| commit | 0f943c941bf0c7abc0358598f4a323b031bcca80 (patch) | |
| tree | 7dd8ea3484252d469368498846c2c2b7f7500af4 /spec/features/discussion_comments/merge_request_spec.rb | |
| parent | 74fbc694de9a9cfe8a048c3c8d937f8e7068ce21 (diff) | |
| parent | 043f8c260f49bb14f1c40ec563179c12c3df7828 (diff) | |
| download | gitlab-ce-0f943c941bf0c7abc0358598f4a323b031bcca80.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/discussion_comments/merge_request_spec.rb')
| -rw-r--r-- | spec/features/discussion_comments/merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/discussion_comments/merge_request_spec.rb b/spec/features/discussion_comments/merge_request_spec.rb index f99ebeb9cd9..31fb9c72d25 100644 --- a/spec/features/discussion_comments/merge_request_spec.rb +++ b/spec/features/discussion_comments/merge_request_spec.rb @@ -7,7 +7,7 @@ describe 'Discussion Comments Merge Request', :feature, :js do before do project.add_master(user) - login_as(user) + gitlab_sign_in(user) visit namespace_project_merge_request_path(project.namespace, project, merge_request) end |