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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
dcc9dc94
Commit
dcc9dc94
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-organize profile settings titles and headers
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
72e41096
No related merge requests found
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
10 deletions
+11
-10
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+2
-2
app/views/profiles/applications.html.haml
app/views/profiles/applications.html.haml
+1
-1
app/views/profiles/design.html.haml
app/views/profiles/design.html.haml
+1
-1
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+1
-1
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/index.html.haml
+1
-1
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+1
-1
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+2
-1
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+2
-2
No files found.
app/views/layouts/profile.html.haml
View file @
dcc9dc94
-
page_title
"
Profile
"
-
page_title
"
Settings
"
-
header_title
"
Profile
"
,
profile_path
-
header_title
"
Settings
"
,
profile_path
-
sidebar
"profile"
-
sidebar
"profile"
=
render
template:
"layouts/application"
=
render
template:
"layouts/application"
This diff is collapsed.
Click to expand it.
app/views/profiles/applications.html.haml
View file @
dcc9dc94
-
page_title
"Applications"
-
page_title
"Applications"
%h3
.page-title
%h3
.page-title
Application Settings
=
page_title
%p
.light
%p
.light
OAuth2 protocol settings below.
OAuth2 protocol settings below.
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/design.html.haml
View file @
dcc9dc94
-
page_title
"Design"
-
page_title
"Design"
%h3
.page-title
%h3
.page-title
Design Settings
=
page_title
%p
.light
%p
.light
Appearance settings will be saved to your profile and made available across all devices.
Appearance settings will be saved to your profile and made available across all devices.
%hr
%hr
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/emails/index.html.haml
View file @
dcc9dc94
-
page_title
"Emails"
-
page_title
"Emails"
%h3
.page-title
%h3
.page-title
Email Settings
=
page_title
%p
.light
%p
.light
Your
Your
%b
Primary Email
%b
Primary Email
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/keys/index.html.haml
View file @
dcc9dc94
-
page_title
"SSH Keys"
-
page_title
"SSH Keys"
%h3
.page-title
%h3
.page-title
SSH Keys Settings
=
page_title
.pull-right
.pull-right
=
link_to
"Add SSH Key"
,
new_profile_key_path
,
class:
"btn btn-new"
=
link_to
"Add SSH Key"
,
new_profile_key_path
,
class:
"btn btn-new"
%p
.light
%p
.light
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/notifications/show.html.haml
View file @
dcc9dc94
-
page_title
"Notifications"
-
page_title
"Notifications"
%h3
.page-title
%h3
.page-title
Notifications Settings
=
page_title
%p
.light
%p
.light
These are your global notification settings.
These are your global notification settings.
%hr
%hr
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/passwords/edit.html.haml
View file @
dcc9dc94
-
page_title
"Password"
-
page_title
"Password"
%h3
.page-title
Password Settings
%h3
.page-title
=
page_title
%p
.light
%p
.light
-
if
@user
.
password_automatically_set?
-
if
@user
.
password_automatically_set?
Set your password.
Set your password.
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/show.html.haml
View file @
dcc9dc94
-
page_title
"
Settings
"
-
page_title
"
Profile
"
%h3
.page-title
%h3
.page-title
Profile Settings
=
page_title
%p
.light
%p
.light
This information will appear on your profile.
This information will appear on your profile.
-
if
current_user
.
ldap_user?
-
if
current_user
.
ldap_user?
...
...
This diff is collapsed.
Click to expand it.
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