Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-07-06 19:43:51 +0300
committerRobert Speicher <rspeicher@gmail.com>2017-07-06 19:43:51 +0300
commiteef068754af7437baf327c5cb4e2b454ba40a617 (patch)
tree3583327140b2994432de317b4ac06d66b274b430 /spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
parent9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (diff)
parent9274c3c1598f3ff32339e681d5812feeb0f62605 (diff)
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb')
-rw-r--r--spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
index 41854ebdd21..5c291f7b817 100644
--- a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
@@ -68,7 +68,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
project.team << [user, :reporter]
sign_in user
visit new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid,
- discussion_to_resolve: discussion.id)
+ discussion_to_resolve: discussion.id)
end
it 'Shows a notice to ask someone else to resolve the discussions' do