diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-10 17:08:10 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-13 17:59:12 -0400 |
| commit | bf9dd4327e36b6ab0b5440dcff747fff27aa5c22 (patch) | |
| tree | b158cabcc9d8862200e73bf5c3337a2489a3b1fa /app | |
| parent | 1eb9a02f21d45f2fa301576723bbb0a23b5ba22d (diff) | |
| download | gitlab-ce-bf9dd4327e36b6ab0b5440dcff747fff27aa5c22.tar.gz | |
Add feature specs for default dashboard preference
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/preferences/update.js.erb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 8f7c57c12bb..547977596f5 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -33,7 +33,7 @@ Behavior .panel-body .form-group - = f.label :dashboard, class: 'control-label' + = f.label :dashboard, 'Default Dashboard', class: 'control-label' .col-sm-10 = f.select :dashboard, dashboard_choices, {}, class: 'form-control' %p.help-block.hint diff --git a/app/views/profiles/preferences/update.js.erb b/app/views/profiles/preferences/update.js.erb index e952d8f47ea..6c4b0ce757d 100644 --- a/app/views/profiles/preferences/update.js.erb +++ b/app/views/profiles/preferences/update.js.erb @@ -1,4 +1,9 @@ // Remove body class for any previous theme, re-add current one $('body').removeClass('<%= Gitlab::Themes.body_classes %>') $('body').addClass('<%= user_application_theme %>') + +// Re-enable the "Save" button +$('input[type=submit]').enable() + +// Show the notice flash message new Flash('<%= flash.discard(:notice) %>', 'notice') |