Removes EE differences
This commit is contained in:
parent
197399a15b
commit
8e6dea3a3d
2 changed files with 11 additions and 6 deletions
|
@ -92,20 +92,20 @@
|
||||||
.col-lg-8
|
.col-lg-8
|
||||||
.form-group
|
.form-group
|
||||||
%h5= s_('Preferences|Time format')
|
%h5= s_('Preferences|Time format')
|
||||||
.checkbox-icon-inline-wrapper.form-check
|
.checkbox-icon-inline-wrapper
|
||||||
- time_format_label = capture do
|
- time_format_label = capture do
|
||||||
= s_('Preferences|Display time in 24-hour format')
|
= 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
|
= f.label :time_format_in_24h do
|
||||||
= time_format_label
|
= time_format_label
|
||||||
%h5= s_('Preferences|Time display')
|
%h5= s_('Preferences|Time display')
|
||||||
.checkbox-icon-inline-wrapper.form-check
|
.checkbox-icon-inline-wrapper
|
||||||
- time_display_label = capture do
|
- time_display_label = capture do
|
||||||
= s_('Preferences|Use relative times')
|
= 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
|
= f.label :time_display_relative do
|
||||||
= time_display_label
|
= time_display_label
|
||||||
.text-muted
|
.form-text.text-muted
|
||||||
= s_('Preferences|For example: 30 mins ago.')
|
= s_('Preferences|For example: 30 mins ago.')
|
||||||
.col-lg-4.profile-settings-sidebar
|
.col-lg-4.profile-settings-sidebar
|
||||||
.col-lg-8
|
.col-lg-8
|
||||||
|
|
5
changelogs/unreleased/12553-preferences.yml
Normal file
5
changelogs/unreleased/12553-preferences.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Removes EE diff for app/views/profiles/preferences/show.html.haml
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: other
|
Loading…
Reference in a new issue