summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-08-01 18:34:17 +0300
committerValery Sizov <valery@gitlab.com>2016-08-22 18:43:13 +0300
commit8f9a7ca854ffda26c5ce9aed2aec10bf155d0463 (patch)
tree5dc2ac0b10ac93ac122fa398f137e62d817dcbe4 /features
parentfb84439a92e759ff90811e98f6abf6bdbb3e6d55 (diff)
downloadgitlab-ce-8f9a7ca854ffda26c5ce9aed2aec10bf155d0463.tar.gz
Revert the revert of Optimistic Lockingrevert_revert_issuable_lock
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 6bac6011467..967f2edb243 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 differente Project after sorting
+ Scenario: Visiting Merge Requests from a different 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