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
fc8ec950
Commit
fc8ec950
authored
Apr 03, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected capitalizacion on various sections
parent
00e00cac
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
35 additions
and
35 deletions
+35
-35
app/views/events/_event_last_push.html.haml
app/views/events/_event_last_push.html.haml
+2
-2
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+17
-17
app/views/import/github/new.html.haml
app/views/import/github/new.html.haml
+2
-2
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+2
-2
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+2
-2
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+5
-5
app/views/profiles/two_factor_auths/show.html.haml
app/views/profiles/two_factor_auths/show.html.haml
+1
-1
app/views/shared/_personal_access_tokens_form.html.haml
app/views/shared/_personal_access_tokens_form.html.haml
+2
-2
app/views/u2f/_register.html.haml
app/views/u2f/_register.html.haml
+2
-2
No files found.
app/views/events/_event_last_push.html.haml
View file @
fc8ec950
...
@@ -10,5 +10,5 @@
...
@@ -10,5 +10,5 @@
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
.pull-right
.pull-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New
Merge R
equest"
,
class:
"btn btn-info btn-sm"
do
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New
merge r
equest"
,
class:
"btn btn-info btn-sm"
do
Create
Merge R
equest
Create
merge r
equest
app/views/help/ui.html.haml
View file @
fc8ec950
...
@@ -225,7 +225,7 @@
...
@@ -225,7 +225,7 @@
%ul
.dropdown-menu
%ul
.dropdown-menu
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
.dropdown.inline.pull-right
.dropdown.inline.pull-right
%button
.dropdown-menu-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%button
.dropdown-menu-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
Dropdown
Dropdown
...
@@ -233,7 +233,7 @@
...
@@ -233,7 +233,7 @@
%ul
.dropdown-menu.dropdown-menu-align-right
%ul
.dropdown-menu.dropdown-menu-align-right
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
.example
.example
%div
%div
.dropdown.inline
.dropdown.inline
...
@@ -243,7 +243,7 @@
...
@@ -243,7 +243,7 @@
%ul
.dropdown-menu.dropdown-menu-selectable
%ul
.dropdown-menu.dropdown-menu-selectable
%li
%li
%a
.is-active
{
href:
"#"
}
%a
.is-active
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
.example
.example
%div
%div
.dropdown.inline
.dropdown.inline
...
@@ -262,26 +262,26 @@
...
@@ -262,26 +262,26 @@
%ul
%ul
%li
%li
%a
.is-active
{
href:
"#"
}
%a
.is-active
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
.divider
%li
.divider
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
.dropdown-footer
.dropdown-footer
%strong
Tip:
%strong
Tip:
If an author is not a member of this project, you can still filter by his name while using the search field.
If an author is not a member of this project, you can still filter by his name while using the search field.
...
@@ -301,26 +301,26 @@
...
@@ -301,26 +301,26 @@
%ul
%ul
%li
%li
%a
.is-active
{
href:
"#"
}
%a
.is-active
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
.divider
%li
.divider
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
}
Dropdown
O
ption
Dropdown
o
ption
.dropdown-footer
.dropdown-footer
%strong
Tip:
%strong
Tip:
If an author is not a member of this project, you can still filter by his name while using the search field.
If an author is not a member of this project, you can still filter by his name while using the search field.
...
...
app/views/import/github/new.html.haml
View file @
fc8ec950
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
To import a GitHub project, you first need to authorize GitLab to access
To import a GitHub project, you first need to authorize GitLab to access
the list of your GitHub repositories:
the list of your GitHub repositories:
=
link_to
'List
Your GitHub R
epositories'
,
status_import_github_path
,
class:
'btn btn-success'
=
link_to
'List
your GitHub r
epositories'
,
status_import_github_path
,
class:
'btn btn-success'
%hr
%hr
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
=
form_tag
personal_access_token_import_github_path
,
method: :post
,
class:
'form-inline'
do
=
form_tag
personal_access_token_import_github_path
,
method: :post
,
class:
'form-inline'
do
.form-group
.form-group
=
text_field_tag
:personal_access_token
,
''
,
class:
'form-control'
,
placeholder:
"Personal Access Token"
,
size:
40
=
text_field_tag
:personal_access_token
,
''
,
class:
'form-control'
,
placeholder:
"Personal Access Token"
,
size:
40
=
submit_tag
'List
Your GitHub R
epositories'
,
class:
'btn btn-success'
=
submit_tag
'List
your GitHub r
epositories'
,
class:
'btn btn-success'
-
unless
github_import_configured?
-
unless
github_import_configured?
%hr
%hr
...
...
app/views/layouts/header/_default.html.haml
View file @
fc8ec950
...
@@ -29,11 +29,11 @@
...
@@ -29,11 +29,11 @@
-
if
current_user
-
if
current_user
-
if
session
[
:impersonator_id
]
-
if
session
[
:impersonator_id
]
%li
.impersonation
%li
.impersonation
=
link_to
admin_impersonation_path
,
method: :delete
,
title:
"Stop
Impersonation"
,
aria:
{
label:
'Stop I
mpersonation'
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
admin_impersonation_path
,
method: :delete
,
title:
"Stop
impersonation"
,
aria:
{
label:
'Stop i
mpersonation'
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'user-secret fw'
)
=
icon
(
'user-secret fw'
)
-
if
current_user
.
is_admin?
-
if
current_user
.
is_admin?
%li
%li
=
link_to
admin_root_path
,
title:
'Admin
Area'
,
aria:
{
label:
"Admin A
rea"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
admin_root_path
,
title:
'Admin
area'
,
aria:
{
label:
"Admin a
rea"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'wrench fw'
)
=
icon
(
'wrench fw'
)
-
if
current_user
.
can_create_project?
-
if
current_user
.
can_create_project?
%li
%li
...
...
app/views/profiles/accounts/show.html.haml
View file @
fc8ec950
...
@@ -49,14 +49,14 @@
...
@@ -49,14 +49,14 @@
%p
%p
Status:
#{
current_user
.
two_factor_enabled?
?
'Enabled'
:
'Disabled'
}
Status:
#{
current_user
.
two_factor_enabled?
?
'Enabled'
:
'Disabled'
}
-
if
current_user
.
two_factor_enabled?
-
if
current_user
.
two_factor_enabled?
=
link_to
'Manage
Two-Factor A
uthentication'
,
profile_two_factor_auth_path
,
class:
'btn btn-info'
=
link_to
'Manage
two-factor a
uthentication'
,
profile_two_factor_auth_path
,
class:
'btn btn-info'
=
link_to
'Disable'
,
profile_two_factor_auth_path
,
=
link_to
'Disable'
,
profile_two_factor_auth_path
,
method: :delete
,
method: :delete
,
data:
{
confirm:
"Are you sure? This will invalidate your registered applications and U2F devices."
},
data:
{
confirm:
"Are you sure? This will invalidate your registered applications and U2F devices."
},
class:
'btn btn-danger'
class:
'btn btn-danger'
-
else
-
else
.append-bottom-10
.append-bottom-10
=
link_to
'Enable
Two-Factor A
uthentication'
,
profile_two_factor_auth_path
,
class:
'btn btn-success'
=
link_to
'Enable
two-factor a
uthentication'
,
profile_two_factor_auth_path
,
class:
'btn btn-success'
%hr
%hr
-
if
button_based_providers
.
any?
-
if
button_based_providers
.
any?
...
...
app/views/profiles/emails/index.html.haml
View file @
fc8ec950
...
@@ -33,17 +33,17 @@
...
@@ -33,17 +33,17 @@
%li
%li
=
@primary
=
@primary
%span
.pull-right
%span
.pull-right
%span
.label.label-success
Primary
E
mail
%span
.label.label-success
Primary
e
mail
-
if
@primary
===
current_user
.
public_email
-
if
@primary
===
current_user
.
public_email
%span
.label.label-info
Public
E
mail
%span
.label.label-info
Public
e
mail
-
if
@primary
===
current_user
.
notification_email
-
if
@primary
===
current_user
.
notification_email
%span
.label.label-info
Notification
E
mail
%span
.label.label-info
Notification
e
mail
-
@emails
.
each
do
|
email
|
-
@emails
.
each
do
|
email
|
%li
%li
=
email
.
email
=
email
.
email
%span
.pull-right
%span
.pull-right
-
if
email
.
email
===
current_user
.
public_email
-
if
email
.
email
===
current_user
.
public_email
%span
.label.label-info
Public
E
mail
%span
.label.label-info
Public
e
mail
-
if
email
.
email
===
current_user
.
notification_email
-
if
email
.
email
===
current_user
.
notification_email
%span
.label.label-info
Notification
E
mail
%span
.label.label-info
Notification
e
mail
=
link_to
'Remove'
,
profile_email_path
(
email
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-sm btn-warning prepend-left-10'
=
link_to
'Remove'
,
profile_email_path
(
email
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-sm btn-warning prepend-left-10'
app/views/profiles/two_factor_auths/show.html.haml
View file @
fc8ec950
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
=
label_tag
:pin_code
,
nil
,
class:
"label-light"
=
label_tag
:pin_code
,
nil
,
class:
"label-light"
=
text_field_tag
:pin_code
,
nil
,
class:
"form-control"
,
required:
true
=
text_field_tag
:pin_code
,
nil
,
class:
"form-control"
,
required:
true
.prepend-top-default
.prepend-top-default
=
submit_tag
'Register with
Two-Factor A
pp'
,
class:
'btn btn-success'
=
submit_tag
'Register with
two-factor a
pp'
,
class:
'btn btn-success'
%hr
%hr
...
...
app/views/shared/_personal_access_tokens_form.html.haml
View file @
fc8ec950
-
type
=
impersonation
?
"
Impersonation"
:
"P
ersonal Access"
-
type
=
impersonation
?
"
impersonation"
:
"p
ersonal Access"
%h5
.prepend-top-0
%h5
.prepend-top-0
Add a
#{
type
}
Token
Add a
#{
type
}
Token
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
=
render
'shared/tokens/scopes_form'
,
prefix:
'personal_access_token'
,
token:
token
,
scopes:
scopes
=
render
'shared/tokens/scopes_form'
,
prefix:
'personal_access_token'
,
token:
token
,
scopes:
scopes
.prepend-top-default
.prepend-top-default
=
f
.
submit
"Create
#{
type
}
T
oken"
,
class:
"btn btn-create"
=
f
.
submit
"Create
#{
type
}
t
oken"
,
class:
"btn btn-create"
:javascript
:javascript
var
$dateField
=
$
(
'
.datepicker
'
);
var
$dateField
=
$
(
'
.datepicker
'
);
...
...
app/views/u2f/_register.html.haml
View file @
fc8ec950
...
@@ -7,13 +7,13 @@
...
@@ -7,13 +7,13 @@
-
if
current_user
.
two_factor_otp_enabled?
-
if
current_user
.
two_factor_otp_enabled?
.row.append-bottom-10
.row.append-bottom-10
.col-md-3
.col-md-3
%button
#js-setup-u2f-device
.btn.btn-info
Setup
New U2F D
evice
%button
#js-setup-u2f-device
.btn.btn-info
Setup
new U2F d
evice
.col-md-9
.col-md-9
%p
Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left.
%p
Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left.
-
else
-
else
.row.append-bottom-10
.row.append-bottom-10
.col-md-3
.col-md-3
%button
#js-setup-u2f-device
.btn.btn-info
{
disabled:
true
}
Setup
New U2F D
evice
%button
#js-setup-u2f-device
.btn.btn-info
{
disabled:
true
}
Setup
new U2F d
evice
.col-md-9
.col-md-9
%p
.text-warning
You need to register a two-factor authentication app before you can set up a U2F device.
%p
.text-warning
You need to register a two-factor authentication app before you can set up a U2F device.
...
...
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