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
Boxiang Sun
gitlab-ce
Commits
a87b229b
Commit
a87b229b
authored
Jun 30, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix preferences tests.
parent
7b9b2ce3
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12 additions
and
3 deletions
+12
-3
app/views/profiles/_head.html.haml
app/views/profiles/_head.html.haml
+3
-0
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+1
-0
app/views/profiles/audit_log.html.haml
app/views/profiles/audit_log.html.haml
+1
-0
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+1
-0
app/views/profiles/keys/show.html.haml
app/views/profiles/keys/show.html.haml
+1
-0
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+1
-0
app/views/profiles/personal_access_tokens/index.html.haml
app/views/profiles/personal_access_tokens/index.html.haml
+1
-0
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+1
-0
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+1
-3
app/views/profiles/two_factor_auths/show.html.haml
app/views/profiles/two_factor_auths/show.html.haml
+1
-0
No files found.
app/views/profiles/_head.html.haml
0 → 100644
View file @
a87b229b
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_tag
(
'lib/cropper.js'
)
=
page_specific_javascript_tag
(
'profile/application.js'
)
app/views/profiles/accounts/show.html.haml
View file @
a87b229b
-
page_title
"Account"
-
page_title
"Account"
=
render
'profiles/head'
-
if
current_user
.
ldap_user?
-
if
current_user
.
ldap_user?
.alert.alert-info
.alert.alert-info
...
...
app/views/profiles/audit_log.html.haml
View file @
a87b229b
-
page_title
"Audit Log"
-
page_title
"Audit Log"
=
render
'profiles/head'
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
.col-lg-3.profile-settings-sidebar
...
...
app/views/profiles/emails/index.html.haml
View file @
a87b229b
-
page_title
"Emails"
-
page_title
"Emails"
=
render
'profiles/head'
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
.col-lg-3.profile-settings-sidebar
...
...
app/views/profiles/keys/show.html.haml
View file @
a87b229b
-
page_title
@key
.
title
,
"SSH Keys"
-
page_title
@key
.
title
,
"SSH Keys"
=
render
'profiles/head'
=
render
"key_details"
=
render
"key_details"
app/views/profiles/notifications/show.html.haml
View file @
a87b229b
-
page_title
"Notifications"
-
page_title
"Notifications"
=
render
'profiles/head'
%div
%div
-
if
@user
.
errors
.
any?
-
if
@user
.
errors
.
any?
...
...
app/views/profiles/personal_access_tokens/index.html.haml
View file @
a87b229b
-
page_title
"Personal Access Tokens"
-
page_title
"Personal Access Tokens"
=
render
'profiles/head'
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
.col-lg-3.profile-settings-sidebar
...
...
app/views/profiles/preferences/show.html.haml
View file @
a87b229b
-
page_title
'Preferences'
-
page_title
'Preferences'
=
render
'profiles/head'
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'row prepend-top-default js-preferences-form'
}
do
|
f
|
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'row prepend-top-default js-preferences-form'
}
do
|
f
|
.col-lg-3.profile-settings-sidebar
.col-lg-3.profile-settings-sidebar
...
...
app/views/profiles/show.html.haml
View file @
a87b229b
-
content_for
:page_specific_javascripts
do
=
render
'profiles/head'
=
page_specific_javascript_tag
(
'lib/cropper.js'
)
=
page_specific_javascript_tag
(
'profile/application.js'
)
=
form_for
@user
,
url:
profile_path
,
method: :put
,
html:
{
multipart:
true
,
class:
"edit-user prepend-top-default"
},
authenticity_token:
true
do
|
f
|
=
form_for
@user
,
url:
profile_path
,
method: :put
,
html:
{
multipart:
true
,
class:
"edit-user prepend-top-default"
},
authenticity_token:
true
do
|
f
|
=
form_errors
(
@user
)
=
form_errors
(
@user
)
...
...
app/views/profiles/two_factor_auths/show.html.haml
View file @
a87b229b
-
page_title
'Two-Factor Authentication'
,
'Account'
-
page_title
'Two-Factor Authentication'
,
'Account'
-
header_title
"Two-Factor Authentication"
,
profile_two_factor_auth_path
-
header_title
"Two-Factor Authentication"
,
profile_two_factor_auth_path
=
render
'profiles/head'
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3
.col-lg-3
...
...
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