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
3f28d9f7
Commit
3f28d9f7
authored
Aug 15, 2013
by
Henry Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved wording for the settings in the "My Profile" section
parent
602e2e68
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
app/views/profiles/account.html.haml
app/views/profiles/account.html.haml
+6
-6
app/views/profiles/groups/index.html.haml
app/views/profiles/groups/index.html.haml
+1
-1
app/views/profiles/history.html.haml
app/views/profiles/history.html.haml
+1
-1
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/index.html.haml
+2
-2
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+2
-2
No files found.
app/views/profiles/account.html.haml
View file @
3f28d9f7
%h3
.page-title
%h3
.page-title
Account settings
Account settings
%p
.light
%p
.light
You can change
password, username,
private token here.
You can change
your password, username and
private token here.
-
if
current_user
.
ldap_user?
-
if
current_user
.
ldap_user?
Some options are unavailable for LDAP accounts
Some options are unavailable for LDAP accounts
%hr
%hr
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
%legend
Password
%legend
Password
=
form_for
@user
,
url:
update_password_profile_path
,
method: :put
do
|
f
|
=
form_for
@user
,
url:
update_password_profile_path
,
method: :put
do
|
f
|
.padded
.padded
%p
.slead
After
successful password update you will be redirected to login page where you should login with
new password
%p
.slead
After
a successful password update you will be redirected to login page where you should login with your
new password
-
if
@user
.
errors
.
any?
-
if
@user
.
errors
.
any?
.alert.alert-error
.alert.alert-error
%ul
%ul
...
@@ -49,9 +49,9 @@
...
@@ -49,9 +49,9 @@
=
form_for
@user
,
url:
reset_private_token_profile_path
,
method: :put
do
|
f
|
=
form_for
@user
,
url:
reset_private_token_profile_path
,
method: :put
do
|
f
|
.data
.data
%p
.slead
%p
.slead
Private token
used to access application resources without authentication.
Your private token is
used to access application resources without authentication.
%br
%br
It can be used for atom feed
or API
It can be used for atom feed
s or the API.
%p
.cgray
%p
.cgray
-
if
current_user
.
private_token
-
if
current_user
.
private_token
=
text_field_tag
"token"
,
current_user
.
private_token
,
class:
"input-xxlarge large_text input-xpadding"
=
text_field_tag
"token"
,
current_user
.
private_token
,
class:
"input-xxlarge large_text input-xpadding"
...
@@ -81,8 +81,8 @@
...
@@ -81,8 +81,8 @@
%i
.icon-remove
%i
.icon-remove
Failed
Failed
%ul
.cred
%ul
.cred
%li
It will change web url
for personal projects.
%li
This will change the web URL
for personal projects.
%li
It
will change the git path to repositories for personal projects.
%li
This
will change the git path to repositories for personal projects.
.controls
.controls
=
f
.
submit
'Save username'
,
class:
"btn btn-save"
=
f
.
submit
'Save username'
,
class:
"btn btn-save"
...
...
app/views/profiles/groups/index.html.haml
View file @
3f28d9f7
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%i
.icon-plus
%i
.icon-plus
New Group
New Group
%p
.light
%p
.light
Members of group have access to all group projects.
Group members have access to all a group's projects
%hr
%hr
.ui-box
.ui-box
.title
.title
...
...
app/views/profiles/history.html.haml
View file @
3f28d9f7
%h3
.page-title
%h3
.page-title
Account history
Account history
%p
.light
%p
.light
You can see all events authored by your account
here
All events created by your account are listed
here
%hr
%hr
.profile_history
.profile_history
=
render
@events
=
render
@events
...
...
app/views/profiles/keys/index.html.haml
View file @
3f28d9f7
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
.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
SSH key
allows
you to establish a secure connection between your computer and GitLab
SSH key
s allow
you to establish a secure connection between your computer and GitLab
%br
%br
Before you can add
ssh
key you need to
Before you can add
an SSH
key you need to
=
link_to
"generate it"
,
help_ssh_path
=
link_to
"generate it"
,
help_ssh_path
%hr
%hr
...
...
app/views/profiles/notifications/show.html.haml
View file @
3f28d9f7
%h3
.page-title
%h3
.page-title
Notifications settings
Notifications settings
%p
.light
%p
.light
Application us
e email specified in your profile for notifications
GitLab uses th
e email specified in your profile for notifications
%hr
%hr
.alert.alert-info
.alert.alert-info
%p
%p
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
%p
%p
%i
.icon-circle.cblue
%i
.icon-circle.cblue
%strong
Participating
%strong
Participating
–
You will
receive only notifications from related resources(ex. from assigned issue or your commit
)
–
You will
only receive notifications from related resources (e.g. from your commits or assigned issues
)
%p
%p
%i
.icon-circle.cgreen
%i
.icon-circle.cgreen
%strong
Watch
%strong
Watch
...
...
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