summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-07-13 19:17:17 -0700
committerStan Hu <stanhu@gmail.com>2016-07-13 19:17:17 -0700
commitd7c591915893c8c572e9135db4ec27dc174823fd (patch)
treebfa34a136c2d30b00ba0bffc9654da7794ed858f /features
parent7968484dfa363537e6e7822ca1ec100bcd0ec4f8 (diff)
downloadgitlab-ce-d7c591915893c8c572e9135db4ec27dc174823fd.tar.gz
Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuable
This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.
Diffstat (limited to 'features')
-rw-r--r--features/project/merge_requests.feature2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 8176ec5ab45..21768c15c17 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -89,7 +89,7 @@ Feature: Project Merge Requests
Then The list should be sorted by "Oldest updated"
@javascript
- Scenario: Visiting Merge Requests from a different Project after sorting
+ Scenario: Visiting Merge Requests from a differente Project after sorting
Given I visit project "Shop" merge requests page
And I sort the list by "Oldest updated"
And I visit dashboard merge requests page