diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-11 11:25:40 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-11 11:25:40 +0000 |
| commit | 69a8bf367c4de56864e0e91a68c185901809921a (patch) | |
| tree | 11ea632fe48afa36a960618aa1d2700aefbf92b4 /features/project | |
| parent | 986b4a54ee159de56a7ebe51327887b49474813b (diff) | |
| parent | 12ff7ee93348239d545e0553a49881cfe490420e (diff) | |
| download | gitlab-ce-69a8bf367c4de56864e0e91a68c185901809921a.tar.gz | |
Merge branch 'mr-ui-update' into 'master'
Updated UI for new merge request
Closes #2540
See merge request !3228
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/forked_merge_requests.feature | 1 | ||||
| -rw-r--r-- | features/project/merge_requests.feature | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature index 10bd6fec803..67f1e117f7f 100644 --- a/features/project/forked_merge_requests.feature +++ b/features/project/forked_merge_requests.feature @@ -4,6 +4,7 @@ Feature: Project Forked Merge Requests And I am a member of project "Shop" And I have a project forked off of "Shop" called "Forked Shop" + @javascript Scenario: I submit new unassigned merge request to a forked project Given I visit project "Forked Shop" merge requests page And I click link "New Merge Request" diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 823658b4f24..ecda4ea8240 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -70,6 +70,7 @@ Feature: Project Merge Requests When I click link "Reopen" Then I should see reopened merge request "Bug NS-04" + @javascript Scenario: I submit new unassigned merge request Given I click link "New Merge Request" And I submit new merge request "Wiki Feature" |