diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/projects/edit.html.haml | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/projects/edit.html.haml')
-rw-r--r-- | app/views/projects/edit.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 1609d81c0fd..92dbde07709 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -5,6 +5,8 @@ - expanded = expanded_by_default? - reduce_visibility_form_id = 'reduce-visibility-form' += render_if_exists 'shared/minute_limit_banner', namespace: @project + %section.settings.general-settings.no-animate.expanded#js-general-settings .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Naming, topics, avatar') @@ -33,7 +35,7 @@ .settings-content = render_if_exists 'shared/promotions/promote_mr_features' - = form_for @project, html: { multipart: true, class: "merge-request-settings-form js-mr-settings-form" }, authenticity_token: true do |f| + = gitlab_ui_form_for @project, html: { multipart: true, class: "merge-request-settings-form js-mr-settings-form" }, authenticity_token: true do |f| %input{ name: 'update_section', type: 'hidden', value: 'js-merge-request-settings' } = render 'projects/merge_request_settings', form: f = f.submit _('Save changes'), class: "btn gl-button btn-confirm rspec-save-merge-request-changes", data: { qa_selector: 'save_merge_request_changes_button' } @@ -98,7 +100,7 @@ .input-group-text #{Gitlab::Utils.append_path(root_url, @project.namespace.full_path)}/ = f.text_field :path, class: 'form-control h-auto', data: { qa_selector: 'project_path_field' } - = f.submit _('Change path'), class: "gl-button btn btn-warning", data: { qa_selector: 'change_path_button' } + = f.submit _('Change path'), class: "gl-button btn btn-danger", data: { qa_selector: 'change_path_button' } = render 'transfer', project: @project |