Skip to content
Snippets Groups Projects
Commit 846f8317 authored by Sabba Petri's avatar Sabba Petri
Browse files

Fixes grammatical consistency and small changes

This commit adds consistency to small things like periods, commas,
etc. Also gives additional information to buttons and headers.
Fixes #2002, #2005, #2003
parent bb235837
No related branches found
No related tags found
1 merge request!8686add "Uplaod" and "Replace" functionality
%h3.page-title
Account settings
Account Settings
%p.light
You can change your username and private token here.
- if current_user.ldap_user?
Loading
Loading
@@ -10,7 +10,7 @@
.account-page
%fieldset.update-token
%legend
Private token
Reset Private token
%div
= form_for @user, url: reset_private_token_profile_path, method: :put do |f|
.data
Loading
Loading
@@ -25,7 +25,7 @@
- if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "form-control"
%div
= f.submit 'Reset', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token"
= f.submit 'Reset private token', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token"
- else
%span You don`t have one yet. Click generate to fix it.
= f.submit 'Generate', class: "btn success btn-build-token"
Loading
Loading
@@ -43,7 +43,7 @@
- if show_profile_username_tab?
%fieldset.update-username
%legend
Username
Change Username
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
%p
Changing your username will change path to all personal projects!
Loading
Loading
%h3.page-title
OAuth2
Application Settings
%p.light
OAuth2 protocol settings below.
 
%fieldset.oauth-applications
%legend Your applications
Loading
Loading
%h3.page-title
My appearance settings
Design Settings
%p.light
Appearance settings saved to your profile and available across all devices
Appearance settings will be saved to your profile and made available across all devices.
%hr
 
= form_for @user, url: profile_path, remote: true, method: :put do |f|
Loading
Loading
%h3.page-title
My email addresses
Email Settings
%p.light
Your
%b Primary Email
Loading
Loading
@@ -34,4 +34,4 @@
.col-sm-10
= f.text_field :email, class: 'form-control'
.form-actions
= f.submit 'Add', class: 'btn btn-create'
= f.submit 'Add email address', class: 'btn btn-create'
%h3.page-title
Group membership
Group Membership
- if current_user.can_create_group?
%span.pull-right
= link_to new_group_path, class: "btn btn-new" do
%i.fa.fa-plus
New Group
%p.light
Group members have access to all a group's projects
Group members have access to all group projects.
%hr
.panel.panel-default
.panel-heading
Loading
Loading
%h3.page-title
Account history
My Account History
%p.light
All events created by your account are listed here
All events created by your account are listed below.
%hr
.profile_history
= render @events
Loading
Loading
%h3.page-title
My SSH keys (#{@keys.count})
SSH Keys Settings
.pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
%p.light
SSH keys allow you to establish a secure connection between your computer and GitLab
My SSH keys: #{@keys.count}
%br
Before you can add an SSH key you need to
= link_to "generate it", help_page_path("ssh", "README")
= link_to "generate it.", help_page_path("ssh", "README")
%hr
 
= render 'key_table'
%h3.page-title
Notifications settings
Notifications Settings
%p.light
These are your global notification settings.
%hr
 
= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications form-horizontal global-notifications-form' } do |f|
-if @user.errors.any?
%div.alert.alert-danger
Loading
Loading
@@ -60,7 +59,7 @@
%p
You can also specify notification level per group or per project.
%br
By default all projects and groups uses notification level set above.
By default, all projects and groups will use the notification level set above.
%h4 Groups:
%ul.bordered-list
- @group_members.each do |users_group|
Loading
Loading
@@ -69,7 +68,7 @@
 
.col-md-6
%p
To specify notification level per project of a group you belong to,
To specify the notification level per project of a group you belong to,
%br
you need to be a member of the project itself, not only its group.
%h4 Projects:
Loading
Loading
%h3.page-title Password
%h3.page-title Password Settings
%p.light
- if @user.password_automatically_set?
Set your password.
Loading
Loading
@@ -12,7 +12,7 @@
- unless @user.password_automatically_set?
You must provide current password in order to change it.
%br
After a successful password update you will be redirected to login page where you should login with your new password
After a successful password update, you will be redirected to the login page where you can log in with your new password.
-if @user.errors.any?
.alert.alert-danger
%ul
Loading
Loading
%h3.page-title
Profile settings
Profile Settings
%p.light
This information appears on your profile.
This information will appear on your profile.
- if current_user.ldap_user?
Some options are unavailable for LDAP accounts
%hr
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