diff options
| author | Sam Rose <sam@gitlab.com> | 2017-04-11 22:44:22 -0400 |
|---|---|---|
| committer | Sam Rose <sam@gitlab.com> | 2017-04-28 12:52:36 -0400 |
| commit | 9f3985c6133507ac721abbb4c19049656008ec68 (patch) | |
| tree | 2b1ccb4c3adf30ced424c690a8dc3a2e6e74fc35 /spec/features/projects/merge_request_button_spec.rb | |
| parent | 6dc424c949ab3de9395d821b05d2e1cc5f632ed2 (diff) | |
| download | gitlab-ce-9f3985c6133507ac721abbb4c19049656008ec68.tar.gz | |
Move PDFLab into GitLabpdflab-in-repo
Diffstat (limited to 'spec/features/projects/merge_request_button_spec.rb')
| -rw-r--r-- | spec/features/projects/merge_request_button_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb index 05f3162f13c..1370ab1c521 100644 --- a/spec/features/projects/merge_request_button_spec.rb +++ b/spec/features/projects/merge_request_button_spec.rb @@ -85,8 +85,8 @@ feature 'Merge Request button', feature: true do context 'on branches page' do it_behaves_like 'Merge request button only shown when allowed' do let(:label) { 'Merge request' } - let(:url) { namespace_project_branches_path(project.namespace, project) } - let(:fork_url) { namespace_project_branches_path(forked_project.namespace, forked_project) } + let(:url) { namespace_project_branches_path(project.namespace, project, search: 'feature') } + let(:fork_url) { namespace_project_branches_path(forked_project.namespace, forked_project, search: 'feature') } end end |