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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
47989d60
Commit
47989d60
authored
May 28, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Consistent header look for setting pages
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
dcc9dc94
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
14 deletions
+24
-14
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+5
-0
app/views/profiles/applications.html.haml
app/views/profiles/applications.html.haml
+1
-0
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+18
-14
No files found.
app/views/profiles/accounts/show.html.haml
View file @
47989d60
-
page_title
"Account"
-
page_title
"Account"
%h3
.page-title
=
page_title
%p
.light
Change your username and basic account settings.
%hr
-
if
current_user
.
ldap_user?
-
if
current_user
.
ldap_user?
.alert.alert-info
.alert.alert-info
Some options are unavailable for LDAP accounts
Some options are unavailable for LDAP accounts
...
...
app/views/profiles/applications.html.haml
View file @
47989d60
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
=
page_title
=
page_title
%p
.light
%p
.light
OAuth2 protocol settings below.
OAuth2 protocol settings below.
%hr
%fieldset
.oauth-applications
%fieldset
.oauth-applications
%legend
Your applications
%legend
Your applications
...
...
app/views/profiles/emails/index.html.haml
View file @
47989d60
...
@@ -2,22 +2,26 @@
...
@@ -2,22 +2,26 @@
%h3
.page-title
%h3
.page-title
=
page_title
=
page_title
%p
.light
%p
.light
Your
Control emails linked to your account
%b
Primary Email
will be used for avatar detection and web based operations, such as edits and merges.
%p
.light
Your
%b
Notification Email
will be used for account notifications.
%p
.light
Your
%b
Public Email
will be displayed on your public profile.
%p
.light
All email addresses will be used to identify your commits.
%hr
%hr
%ul
%li
Your
%b
Primary Email
will be used for avatar detection and web based operations, such as edits and merges.
%li
Your
%b
Notification Email
will be used for account notifications.
%li
Your
%b
Public Email
will be displayed on your public profile.
%li
All email addresses will be used to identify your commits.
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
Emails (
#{
@emails
.
count
+
1
}
)
Emails (
#{
@emails
.
count
+
1
}
)
...
...
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