Commit 8e6dea3a authored by Filipa Lacerda's avatar Filipa Lacerda

Removes EE differences

parent 197399a1
...@@ -92,20 +92,20 @@ ...@@ -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
......
---
title: Removes EE diff for app/views/profiles/preferences/show.html.haml
merge_request:
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment