diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-15 20:47:23 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-15 20:47:23 +0000 |
| commit | 4342e3915c9a3d374f3862b2cfc3ddb07ae56169 (patch) | |
| tree | 55177a1d1d29d75e6c8db73557344745fb4536af | |
| parent | 681e5f77f6e33694b996b71c8ae554f4446448ae (diff) | |
| parent | 7d79b5ccc4bb5f51bf04f80083c31127f70c06ca (diff) | |
| download | gitlab-ce-4342e3915c9a3d374f3862b2cfc3ddb07ae56169.tar.gz | |
Merge branch '43201-rename-repository-submit-button-disabled' into 'master'
Resolve "Renaming repository (project[name]) fails on 2nd try if the validation has failed"
Closes #43201
See merge request gitlab-org/gitlab-ce!17150
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/update.js.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/43201-rename-repository-submit-button-disabled.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index e16d132f869..0931ceb1512 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -58,7 +58,7 @@ - if @project.avatar? %hr = link_to _('Remove avatar'), project_avatar_path(@project), data: { confirm: _("Avatar will be removed. Are you sure?") }, method: :delete, class: "btn btn-danger btn-inverted" - = f.submit 'Save changes', class: "btn btn-success" + = f.submit 'Save changes', class: "btn btn-success js-btn-save-general-project-settings" %section.settings.sharing-permissions.no-animate{ class: ('expanded' if expanded) } .settings-header diff --git a/app/views/projects/update.js.haml b/app/views/projects/update.js.haml index 2c05ebe52ae..1a353953838 100644 --- a/app/views/projects/update.js.haml +++ b/app/views/projects/update.js.haml @@ -6,4 +6,4 @@ $(".project-edit-errors").html("#{escape_javascript(render('errors'))}"); $('.save-project-loader').hide(); $('.project-edit-container').show(); - $('.edit-project .btn-save').enable(); + $('.edit-project .js-btn-save-general-project-settings').enable(); diff --git a/changelogs/unreleased/43201-rename-repository-submit-button-disabled.yml b/changelogs/unreleased/43201-rename-repository-submit-button-disabled.yml new file mode 100644 index 00000000000..b527000332e --- /dev/null +++ b/changelogs/unreleased/43201-rename-repository-submit-button-disabled.yml @@ -0,0 +1,5 @@ +--- +title: Allows project rename after validation error +merge_request: 17150 +author: +type: fixed |