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
9e554a52
Commit
9e554a52
authored
Mar 22, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update views to single form of address. Change "my" to "your"
parent
b3c6f0b2
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
17 additions
and
19 deletions
+17
-19
app/helpers/search_helper.rb
app/helpers/search_helper.rb
+3
-3
app/views/devise/mailer/confirmation_instructions.html.erb
app/views/devise/mailer/confirmation_instructions.html.erb
+1
-1
app/views/devise/mailer/reset_password_instructions.html.erb
app/views/devise/mailer/reset_password_instructions.html.erb
+1
-1
app/views/devise/mailer/unlock_instructions.html.erb
app/views/devise/mailer/unlock_instructions.html.erb
+1
-1
app/views/devise/passwords/edit.html.haml
app/views/devise/passwords/edit.html.haml
+1
-1
app/views/devise/registrations/edit.html.erb
app/views/devise/registrations/edit.html.erb
+2
-2
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+1
-1
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.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
+0
-2
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
app/views/snippets/current_user_index.html.haml
app/views/snippets/current_user_index.html.haml
+1
-1
app/views/snippets/index.html.haml
app/views/snippets/index.html.haml
+2
-2
app/views/snippets/show.html.haml
app/views/snippets/show.html.haml
+1
-1
No files found.
app/helpers/search_helper.rb
View file @
9e554a52
...
@@ -23,9 +23,9 @@ module SearchHelper
...
@@ -23,9 +23,9 @@ module SearchHelper
# Autocomplete results for various settings pages
# Autocomplete results for various settings pages
def
default_autocomplete
def
default_autocomplete
[
[
{
label:
"
My
Profile settings"
,
url:
profile_path
},
{
label:
"Profile settings"
,
url:
profile_path
},
{
label:
"
My
SSH Keys"
,
url:
profile_keys_path
},
{
label:
"SSH Keys"
,
url:
profile_keys_path
},
{
label:
"
My
Dashboard"
,
url:
root_path
},
{
label:
"Dashboard"
,
url:
root_path
},
{
label:
"Admin Section"
,
url:
admin_root_path
},
{
label:
"Admin Section"
,
url:
admin_root_path
},
]
]
end
end
...
...
app/views/devise/mailer/confirmation_instructions.html.erb
View file @
9e554a52
...
@@ -6,4 +6,4 @@
...
@@ -6,4 +6,4 @@
<p>
You can confirm your account through the link below:
</p>
<p>
You can confirm your account through the link below:
</p>
<%
end
%>
<%
end
%>
<p>
<%=
link_to
'Confirm
my
account'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
%>
</p>
<p>
<%=
link_to
'Confirm
your
account'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
%>
</p>
app/views/devise/mailer/reset_password_instructions.html.erb
View file @
9e554a52
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<p>
Someone has requested a link to change your password, and you can do this through the link below.
</p>
<p>
Someone has requested a link to change your password, and you can do this through the link below.
</p>
<p>
<%=
link_to
'Change
my
password'
,
edit_password_url
(
@resource
,
reset_password_token:
@token
)
%>
</p>
<p>
<%=
link_to
'Change
your
password'
,
edit_password_url
(
@resource
,
reset_password_token:
@token
)
%>
</p>
<p>
If you didn't request this, please ignore this email.
</p>
<p>
If you didn't request this, please ignore this email.
</p>
<p>
Your password won't change until you access the link above and create a new one.
</p>
<p>
Your password won't change until you access the link above and create a new one.
</p>
app/views/devise/mailer/unlock_instructions.html.erb
View file @
9e554a52
...
@@ -4,4 +4,4 @@
...
@@ -4,4 +4,4 @@
<p>
Click the link below to unlock your account:
</p>
<p>
Click the link below to unlock your account:
</p>
<p>
<%=
link_to
'Unlock
my
account'
,
unlock_url
(
@resource
,
unlock_token:
@token
)
%>
</p>
<p>
<%=
link_to
'Unlock
your
account'
,
unlock_url
(
@resource
,
unlock_token:
@token
)
%>
</p>
app/views/devise/passwords/edit.html.haml
View file @
9e554a52
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
%div
%div
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm new password"
,
required:
true
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm new password"
,
required:
true
.clearfix
.clearfix
=
f
.
submit
"Change
my
password"
,
class:
"btn btn-primary"
=
f
.
submit
"Change
your
password"
,
class:
"btn btn-primary"
.clearfix.prepend-top-20
.clearfix.prepend-top-20
%p
%p
...
...
app/views/devise/registrations/edit.html.erb
View file @
9e554a52
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
<div>
<%=
f
.
submit
"Update"
,
class:
"input_button"
%>
</div>
<div>
<%=
f
.
submit
"Update"
,
class:
"input_button"
%>
</div>
<%
end
%>
<%
end
%>
<h3>
Cancel
my
account
</h3>
<h3>
Cancel
your
account
</h3>
<p>
Unhappy?
<%=
link_to
"Cancel
my
account"
,
registration_path
(
resource_name
),
data:
{
confirm:
"Are you sure?"
},
method: :delete
%>
.
</p>
<p>
Unhappy?
<%=
link_to
"Cancel
your
account"
,
registration_path
(
resource_name
),
data:
{
confirm:
"Are you sure?"
},
method: :delete
%>
.
</p>
<%=
link_to
"Back"
,
:back
%>
<%=
link_to
"Back"
,
:back
%>
app/views/help/ui.html.haml
View file @
9e554a52
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
%code
.panel .well-list
%code
.panel .well-list
.panel.panel-default
.panel.panel-default
.panel-heading
My
list
.panel-heading
Your
list
%ul
.well-list
%ul
.well-list
%li
%li
One item
One item
...
...
app/views/layouts/_head_panel.html.haml
View file @
9e554a52
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
=
link_to
explore_root_path
,
title:
"Explore"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Public area'
do
=
link_to
explore_root_path
,
title:
"Explore"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Public area'
do
%i
.fa.fa-globe
%i
.fa.fa-globe
%li
%li
=
link_to
user_snippets_path
(
current_user
),
title:
"
My snippets"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'My
snippets'
do
=
link_to
user_snippets_path
(
current_user
),
title:
"
Your snippets"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Your
snippets'
do
%i
.fa.fa-clipboard
%i
.fa.fa-clipboard
-
if
current_user
.
is_admin?
-
if
current_user
.
is_admin?
%li
%li
...
...
app/views/profiles/history.html.haml
View file @
9e554a52
%h3
.page-title
%h3
.page-title
My
Account History
Your
Account History
%p
.light
%p
.light
All events created by your account are listed below.
All events created by your account are listed below.
%hr
%hr
...
...
app/views/profiles/keys/index.html.haml
View file @
9e554a52
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
.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
My SSH keys:
#{
@keys
.
count
}
%br
Before you can add an SSH key you need to
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
%hr
...
...
app/views/projects/_home_panel.html.haml
View file @
9e554a52
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
.fork-buttons
.fork-buttons
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
&&
@project
.
namespace
!=
current_user
.
namespace
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
&&
@project
.
namespace
!=
current_user
.
namespace
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
=
link_to
namespace_project_path
(
current_user
,
current_user
.
fork_of
(
@project
)),
title:
'Go to
my
fork'
do
=
link_to
namespace_project_path
(
current_user
,
current_user
.
fork_of
(
@project
)),
title:
'Go to
your
fork'
do
=
link_to_toggle_fork
=
link_to_toggle_fork
-
else
-
else
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
do
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
do
...
...
app/views/snippets/current_user_index.html.haml
View file @
9e554a52
%h3
.page-title
%h3
.page-title
My
Snippets
Your
Snippets
.pull-right
.pull-right
=
link_to
new_snippet_path
,
class:
"btn btn-new btn-grouped"
,
title:
"New Snippet"
do
=
link_to
new_snippet_path
,
class:
"btn btn-new btn-grouped"
,
title:
"New Snippet"
do
Add new snippet
Add new snippet
...
...
app/views/snippets/index.html.haml
View file @
9e554a52
...
@@ -2,12 +2,12 @@
...
@@ -2,12 +2,12 @@
Public snippets
Public snippets
.pull-right
.pull-right
-
if
current_user
-
if
current_user
=
link_to
new_snippet_path
,
class:
"btn btn-new btn-grouped"
,
title:
"New Snippet"
do
=
link_to
new_snippet_path
,
class:
"btn btn-new btn-grouped"
,
title:
"New Snippet"
do
Add new snippet
Add new snippet
=
link_to
user_snippets_path
(
current_user
),
class:
"btn btn-grouped"
do
=
link_to
user_snippets_path
(
current_user
),
class:
"btn btn-grouped"
do
My
snippets
Your
snippets
%p
.light
%p
.light
Public snippets created by you and other users are listed here
Public snippets created by you and other users are listed here
...
...
app/views/snippets/show.html.haml
View file @
9e554a52
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
.back-link
.back-link
-
if
@snippet
.
author
==
current_user
-
if
@snippet
.
author
==
current_user
=
link_to
user_snippets_path
(
current_user
)
do
=
link_to
user_snippets_path
(
current_user
)
do
←
my
snippets
←
your
snippets
-
else
-
else
=
link_to
snippets_path
do
=
link_to
snippets_path
do
←
discover snippets
←
discover snippets
...
...
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