Merge branch 'fix-mr-close-button' into 'master'
Fixes issue with close button not working on MR Closes #14383 See merge request !3295
This commit is contained in:
commit
9280fd4acd
|
@ -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')
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue