Skip to content
Snippets Groups Projects
Commit 3f28d9f7 authored by Henry Smith's avatar Henry Smith
Browse files

Improved wording for the settings in the "My Profile" section

parent 602e2e68
No related branches found
No related tags found
No related merge requests found
%h3.page-title
Account settings
%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?
Some options are unavailable for LDAP accounts
%hr
Loading
Loading
@@ -20,7 +20,7 @@
%legend Password
= form_for @user, url: update_password_profile_path, method: :put do |f|
.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?
.alert.alert-error
%ul
Loading
Loading
@@ -49,9 +49,9 @@
= form_for @user, url: reset_private_token_profile_path, method: :put do |f|
.data
%p.slead
Private token used to access application resources without authentication.
Your private token is used to access application resources without authentication.
%br
It can be used for atom feed or API
It can be used for atom feeds or the API.
%p.cgray
- if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text input-xpadding"
Loading
Loading
@@ -81,8 +81,8 @@
%i.icon-remove
Failed
%ul.cred
%li It will change web url for personal projects.
%li It will change the git path to repositories for personal projects.
%li This will change the web URL for personal projects.
%li This will change the git path to repositories for personal projects.
.controls
= f.submit 'Save username', class: "btn btn-save"
 
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@
%i.icon-plus
New Group
%p.light
Members of group have access to all group projects.
Group members have access to all a group's projects
%hr
.ui-box
.title
Loading
Loading
%h3.page-title
Account history
%p.light
You can see all events authored by your account here
All events created by your account are listed here
%hr
.profile_history
= render @events
Loading
Loading
Loading
Loading
@@ -3,9 +3,9 @@
.pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
%p.light
SSH key allows you to establish a secure connection between your computer and GitLab
SSH keys allow you to establish a secure connection between your computer and GitLab
%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
%hr
 
Loading
Loading
%h3.page-title
Notifications settings
%p.light
Application use email specified in your profile for notifications
GitLab uses the email specified in your profile for notifications
%hr
.alert.alert-info
%p
Loading
Loading
@@ -11,7 +11,7 @@
%p
%i.icon-circle.cblue
%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
%i.icon-circle.cgreen
%strong Watch
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment