diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-05 15:18:46 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-05 15:18:46 +0300 |
| commit | e7d0d50ff14fe7160d9997472add38cb5154df09 (patch) | |
| tree | e5483e9614538f4c27449282d64b1eab23f59d6f | |
| parent | 9be879c174450b2ba2c1968d9b94cce0de95aa80 (diff) | |
| parent | 8e6dea3a3d11a8bf5c3fb15ce9dade4cd71936e8 (diff) | |
Merge branch '12553-preferences' into 'master'
Removes EE differences for app/views/profiles/preferences/show.html.haml
Closes gitlab-ee#12553
See merge request gitlab-org/gitlab-ce!30397
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 12 | ||||
| -rw-r--r-- | changelogs/unreleased/12553-preferences.yml | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 4ebfaff0860..d16e2dddbe0 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -92,21 +92,21 @@ .col-lg-8 .form-group %h5= s_('Preferences|Time format') - .checkbox-icon-inline-wrapper.form-check + .checkbox-icon-inline-wrapper - time_format_label = capture do = s_('Preferences|Display time in 24-hour format') - = f.check_box :time_format_in_24h, class: 'form-check-input' + = f.check_box :time_format_in_24h = f.label :time_format_in_24h do = time_format_label %h5= s_('Preferences|Time display') - .checkbox-icon-inline-wrapper.form-check + .checkbox-icon-inline-wrapper - time_display_label = capture do = s_('Preferences|Use relative times') - = f.check_box :time_display_relative, class: 'form-check-input' + = f.check_box :time_display_relative = f.label :time_display_relative do = time_display_label - .text-muted - = s_('Preferences|For example: 30 mins ago.') + .form-text.text-muted + = s_('Preferences|For example: 30 mins ago.') .col-lg-4.profile-settings-sidebar .col-lg-8 .form-group diff --git a/changelogs/unreleased/12553-preferences.yml b/changelogs/unreleased/12553-preferences.yml new file mode 100644 index 00000000000..c41a8c98e4e --- /dev/null +++ b/changelogs/unreleased/12553-preferences.yml @@ -0,0 +1,5 @@ +--- +title: Removes EE diff for app/views/profiles/preferences/show.html.haml +merge_request: +author: +type: other |