diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2016-06-07 12:50:29 +0000 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2016-06-07 12:50:29 +0000 |
| commit | afa21054fae2331afcf4b3784a3ffae5657b3e5b (patch) | |
| tree | 935256b141573d1bedc9aa0bdd32062edc13a44e /features/project | |
| parent | 8c356ac5500d7f82e9afa7fa19b44aefa99edfe7 (diff) | |
| parent | d47218fb9732841956a5511afbde38ff731ab106 (diff) | |
| download | gitlab-ce-afa21054fae2331afcf4b3784a3ffae5657b3e5b.tar.gz | |
Merge branch 'zj-workhorse-to-serve-diffs' into 'master'
14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-format
Workhorse to serve raw diffs
Fixes (partially) #13999
Dependent on: gitlab-org/gitlab-workhorse!45
See merge request !4130
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests.feature | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 396eb7cc11b..0e97e4d5954 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -74,18 +74,6 @@ Feature: Project Merge Requests And I submit new merge request "Wiki Feature" Then I should see merge request "Wiki Feature" - Scenario: I download a diff on a public merge request - Given public project "Community" - And "John Doe" owns public project "Community" - And project "Community" has "Bug CO-01" open merge request with diffs inside - Given I logout directly - And I visit merge request page "Bug CO-01" - And I click on "Email Patches" - Then I should see a patch diff - And I visit merge request page "Bug CO-01" - And I click on "Plain Diff" - Then I should see a patch diff - @javascript Scenario: I comment on a merge request Given I visit merge request page "Bug NS-04" |