summaryrefslogtreecommitdiff
path: root/features/project/merge_requests.feature
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-07-18 10:40:22 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-07-18 10:40:22 +0200
commitffea9c46000ade225852ee32e90cb8ad0f4f8316 (patch)
treec798d483a2ccab175d2341fc6e4828a5b5859d66 /features/project/merge_requests.feature
parent22c2814b09960255d9ece0c620858500719858cb (diff)
parentf1083ba1f6e4ff0c01d5e08b2a6c0b1f9b5a9b9a (diff)
downloadgitlab-ce-store-variables-and-when-in-builds-table.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables-and-when-in-builds-tablestore-variables-and-when-in-builds-table
# Conflicts: # db/schema.rb
Diffstat (limited to 'features/project/merge_requests.feature')
-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