diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-26 19:42:02 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-26 19:42:02 +0000 |
| commit | 8968171c9e58708f6f0922a1a337bb622bd8b9b5 (patch) | |
| tree | a9630f0e3634a976f6493558e9b1645624c544cb /features/project | |
| parent | 3605e4307ddf373071c0353a066c50fcead01e45 (diff) | |
| parent | 099a9e016e8c09609fbbbc96c6bca4781f87d487 (diff) | |
| download | gitlab-ce-8968171c9e58708f6f0922a1a337bb622bd8b9b5.tar.gz | |
Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master'
Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form
Closes #32447 and #32907
See merge request !11558
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests/accept.feature | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/features/project/merge_requests/accept.feature b/features/project/merge_requests/accept.feature index c45ed9ea68b..2ab1c19f452 100644 --- a/features/project/merge_requests/accept.feature +++ b/features/project/merge_requests/accept.feature @@ -7,6 +7,7 @@ Feature: Project Merge Requests Acceptance @javascript Scenario: Accepting the Merge Request and removing the source branch Given I am on the Merge Request detail page + When I check the "Remove source branch" option And I click on Accept Merge Request Then I should see merge request merged And I should not see the Remove Source Branch button @@ -14,6 +15,7 @@ Feature: Project Merge Requests Acceptance @javascript Scenario: Accepting the Merge Request when URL has an anchor Given I am on the Merge Request detail with note anchor page + When I check the "Remove source branch" option And I click on Accept Merge Request Then I should see merge request merged And I should not see the Remove Source Branch button @@ -21,7 +23,6 @@ Feature: Project Merge Requests Acceptance @javascript Scenario: Accepting the Merge Request without removing the source branch Given I am on the Merge Request detail page - When I click on "Remove source branch" option When I click on Accept Merge Request Then I should see merge request merged And I should see the Remove Source Branch button |