summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-27 11:40:36 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-27 11:40:36 +0000
commit9eec0d54362199b622fa14858c6f1ea600c295a0 (patch)
tree8b03d6ae66ad4f3986bba0d6ea84aeb234f1de89 /features/project
parent701c2e9a3b4b60642eba0ee00c3e11e1e43fb131 (diff)
parent7df45882a93220c6250294fb653f5e64464ebb64 (diff)
downloadgitlab-ce-9eec0d54362199b622fa14858c6f1ea600c295a0.tar.gz
Merge branch 'accepted-rejected-mrs' into 'master'
Add Accepted and Rejected tabs to MR lists. Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites. ![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png) ![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png) ![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png) Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201. See merge request !702
Diffstat (limited to 'features/project')
-rw-r--r--features/project/merge_requests.feature4
1 files changed, 2 insertions, 2 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 60caf783fe4..7a831901607 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -10,8 +10,8 @@ Feature: Project Merge Requests
Then I should see "Bug NS-04" in merge requests
And I should not see "Feature NS-03" in merge requests
- Scenario: I should see closed merge requests
- Given I click link "Closed"
+ Scenario: I should see rejected merge requests
+ Given I click link "Rejected"
Then I should see "Feature NS-03" in merge requests
And I should not see "Bug NS-04" in merge requests