diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-07-29 19:24:46 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-07-29 19:24:46 +0000 |
| commit | 2a35791a5aed6b088c83a4a0d9e92416368bbd66 (patch) | |
| tree | 6107dda0b81ad678edad2b50a5da548917c5b5a4 | |
| parent | 631957d15b61db6f78f6646afc1d51cc05d1d285 (diff) | |
| parent | 533d53bf90c39d728a07b42027daca1e993b2a78 (diff) | |
| download | gitlab-ce-2a35791a5aed6b088c83a4a0d9e92416368bbd66.tar.gz | |
Merge branch 'tp-qtt182-6' into 'master'
Change qa-merge-request-settings to rspec-merge-request-settings
Closes gitlab-org/quality/team-tasks#182
See merge request gitlab-org/gitlab-ce!31207
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/projects_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index ba412b550f1..763cc764144 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -23,7 +23,7 @@ .js-project-permissions-form = f.submit _('Save changes'), class: "btn btn-success" -%section.qa-merge-request-settings.settings.merge-requests-feature.no-animate#js-merge-request-settings{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] } +%section.qa-merge-request-settings.rspec-merge-request-settings.settings.merge-requests-feature.no-animate#js-merge-request-settings{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] } .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Merge requests') %button.btn.btn-default.js-settings-toggle{ type: 'button' }= expanded ? _('Collapse') : _('Expand') diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index d1e2d17e9cc..67ae26d8d1e 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -387,7 +387,7 @@ describe 'Project' do end it_behaves_like 'dirty submit form', [{ form: '.js-general-settings-form', input: 'input[name="project[name]"]' }, - { form: '.qa-merge-request-settings', input: '#project_printing_merge_request_link_enabled' }] + { form: '.rspec-merge-request-settings', input: '#project_printing_merge_request_link_enabled' }] end def remove_with_confirm(button_text, confirm_with) |