diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-03 21:11:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-03 21:11:13 +0000 |
| commit | 63b3a14f15ee5c202d78b7bd72030f4f437ef982 (patch) | |
| tree | 7994560f5a6bc1d421ce0fe395031e52d2b4719a /app/views/projects | |
| parent | 9578c9f9e88421a5dc4d9215f40d932bd30cbabc (diff) | |
| download | gitlab-ce-63b3a14f15ee5c202d78b7bd72030f4f437ef982.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/edit.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/settings/_general.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/update.js.haml | 10 |
3 files changed, 3 insertions, 14 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 2922ba4fb6e..9388c5fad6d 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -19,7 +19,7 @@ %p= _('Choose visibility level, enable/disable project features and their permissions, disable email notifications, and show default award emoji.') .settings-content - = form_for @project, remote: true, html: { multipart: true, class: "sharing-permissions-form" }, authenticity_token: true do |f| + = form_for @project, html: { multipart: true, class: "sharing-permissions-form" }, authenticity_token: true do |f| %input{ name: 'update_section', type: 'hidden', value: 'js-shared-permissions' } %template.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data_json(@project) .js-project-permissions-form @@ -36,7 +36,7 @@ .settings-content = render_if_exists 'shared/promotions/promote_mr_features' - = form_for @project, remote: true, html: { multipart: true, class: "merge-request-settings-form js-mr-settings-form" }, authenticity_token: true do |f| + = 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-success rspec-save-merge-request-changes", data: { qa_selector: 'save_merge_request_changes_button' } diff --git a/app/views/projects/settings/_general.html.haml b/app/views/projects/settings/_general.html.haml index bd365123b81..d1a95886115 100644 --- a/app/views/projects/settings/_general.html.haml +++ b/app/views/projects/settings/_general.html.haml @@ -1,6 +1,5 @@ -= form_for [@project], remote: true, html: { multipart: true, class: "edit-project js-general-settings-form" }, authenticity_token: true do |f| += form_for [@project], html: { multipart: true, class: "edit-project js-general-settings-form" }, authenticity_token: true do |f| %input{ name: 'update_section', type: 'hidden', value: 'js-general-settings' } - = form_errors(@project) %fieldset .row diff --git a/app/views/projects/update.js.haml b/app/views/projects/update.js.haml deleted file mode 100644 index c5eecc900b2..00000000000 --- a/app/views/projects/update.js.haml +++ /dev/null @@ -1,10 +0,0 @@ -- if @project.valid? - :plain - location.href = "#{edit_project_path(@project, anchor: params[:update_section])}"; - location.reload(); -- else - :plain - $(".flash-container").html("#{escape_javascript(render('errors'))}"); - $('.save-project-loader').hide(); - $('.project-edit-container').show(); - $('.edit-project .js-btn-success-general-project-settings').enable(); |