diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-07 06:27:32 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-07 06:27:32 +0000 |
commit | cc61625948477706d275442afe5c336e64dd1598 (patch) | |
tree | 5b04840e8b77a4f89fa96908061d3c1f51779fab | |
parent | 21935d85382989e38dd4cc12de55966e0c9b6eba (diff) | |
parent | 1a9b0c0e247fb26dea7bd140e1a283488c0404c8 (diff) | |
download | gitlab-ce-cc61625948477706d275442afe5c336e64dd1598.tar.gz |
Merge branch 'add_quick_submission_on_user_settings_page' into 'master'
Add quick submission on user settings page
Closes #37359
See merge request !14007
-rw-r--r-- | app/views/profiles/show.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/add_quick_submission_on_user_settings_page.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 35ad280b037..79f334176a5 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -2,7 +2,7 @@ - @content_class = "limit-container-width" unless fluid_layout = render 'profiles/head' -= bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user prepend-top-default' }, authenticity_token: true do |f| += bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user prepend-top-default js-quick-submit' }, authenticity_token: true do |f| = form_errors(@user) .row diff --git a/changelogs/unreleased/add_quick_submission_on_user_settings_page.yml b/changelogs/unreleased/add_quick_submission_on_user_settings_page.yml new file mode 100644 index 00000000000..3e4105a4232 --- /dev/null +++ b/changelogs/unreleased/add_quick_submission_on_user_settings_page.yml @@ -0,0 +1,5 @@ +--- +title: Add quick submission on user settings page +merge_request: 14007 +author: Vitaliy @blackst0ne Klachkov +type: added |