diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-18 14:49:00 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-18 14:49:00 +0000 |
| commit | 9280fd4acda1da9ed2435bd83d96892d77f37e90 (patch) | |
| tree | 5020e55e312c08cace492d0e2b345c1f08d24a7b | |
| parent | 8dfa0a76492743edbb4266781c9655aae9564723 (diff) | |
| parent | 195ef985f3271e5c64010f192bfe5ee1c78e2ba8 (diff) | |
| download | gitlab-ce-9280fd4acda1da9ed2435bd83d96892d77f37e90.tar.gz | |
Merge branch 'fix-mr-close-button' into 'master'
Fixes issue with close button not working on MR
Closes #14383
See merge request !3295
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 4 | ||||
| -rw-r--r-- | features/project/merge_requests.feature | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index b164231e7ef..82532216589 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -627,10 +627,10 @@ class @Notes if closebtn.text() isnt closetext closebtn.text(closetext) - if reopenbtn.is(':not(.btn-comment-and-reopen)') + if reopenbtn.is('.btn-comment-and-reopen') reopenbtn.removeClass('btn-comment-and-reopen') - if closebtn.is(':not(.btn-comment-and-close)') + if closebtn.is('.btn-comment-and-close') closebtn.removeClass('btn-comment-and-close') if discardbtn.is(':visible') diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 74685d24a7d..823658b4f24 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -325,3 +325,11 @@ Feature: Project Merge Requests When I click the "Target branch" dropdown And I select a new target branch Then I should see new target branch changes + + @javascript + Scenario: I can close merge request after commenting + Given I visit merge request page "Bug NS-04" + And I leave a comment like "XML attached" + Then I should see comment "XML attached" + And I click link "Close" + Then I should see closed merge request "Bug NS-04" |