Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8e6dea3a
Commit
8e6dea3a
authored
Jul 05, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes EE differences
parent
197399a1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+6
-6
changelogs/unreleased/12553-preferences.yml
changelogs/unreleased/12553-preferences.yml
+5
-0
No files found.
app/views/profiles/preferences/show.html.haml
View file @
8e6dea3a
...
@@ -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
...
...
changelogs/unreleased/12553-preferences.yml
0 → 100644
View file @
8e6dea3a
---
title
:
Removes EE diff for app/views/profiles/preferences/show.html.haml
merge_request
:
author
:
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment