diff options
| author | Felipe Artur <felipefac@gmail.com> | 2018-01-26 17:25:01 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-02-19 16:16:56 -0300 |
| commit | 73e50395733285c0e6c8369c2354b166ce19ac40 (patch) | |
| tree | 87313cc06da8b44ea92e87fae555b9062f30f7fc /app/views | |
| parent | 8cfa5ccf5342f98aaf6b0a292d337d3211d5e7ff (diff) | |
| download | gitlab-ce-73e50395733285c0e6c8369c2354b166ce19ac40.tar.gz | |
test merge request rebase
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_merge_request_fast_forward_settings.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/_merge_request_fast_forward_settings.html.haml b/app/views/projects/_merge_request_fast_forward_settings.html.haml index 8129c72feb2..f455522d17c 100644 --- a/app/views/projects/_merge_request_fast_forward_settings.html.haml +++ b/app/views/projects/_merge_request_fast_forward_settings.html.haml @@ -3,7 +3,7 @@ .radio = label_tag :project_merge_method_ff do - = form.radio_button :merge_method, :ff, class: "js-merge-method-radio" + = form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff" %strong Fast-forward merge %br %span.descr diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 0931ceb1512..b947b91322d 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -85,7 +85,7 @@ .settings-content = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f| = render 'merge_request_settings', form: f - = f.submit 'Save changes', class: "btn btn-save" + = f.submit 'Save changes', class: "btn btn-save qa-save-merge-request-changes" = render 'export', project: @project |