kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Removes EE differences

Browse source
This commit is contained in:
Filipa Lacerda 2019-07-05 11:14:46 +01:00
parent 197399a15b
commit 8e6dea3a3d
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/views/profiles/preferences/show.html.haml
View file

@ -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

5
changelogs/unreleased/12553-preferences.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Removes EE diff for app/views/profiles/preferences/show.html.haml
merge_request:
author:
type: other