BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b04d6c2e
Commit
b04d6c2e
authored
Jan 20, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6098 from jeromedalbert/master
Rename "Website url" labels to "Website"
parents
e4418620
9697e532
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
_form.html.haml
app/views/admin/users/_form.html.haml
+1
-1
show.html.haml
app/views/profiles/show.html.haml
+1
-1
_profile.html.haml
app/views/users/_profile.html.haml
+1
-1
No files found.
app/views/admin/users/_form.html.haml
View file @
b04d6c2e
...
...
@@ -81,7 +81,7 @@
=
f
.
label
:twitter
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:twitter
,
class:
'form-control'
.form-group
=
f
.
label
:website_url
,
class:
'control-label'
=
f
.
label
:website_url
,
'Website'
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:website_url
,
class:
'form-control'
.form-actions
...
...
app/views/profiles/show.html.haml
View file @
b04d6c2e
...
...
@@ -47,7 +47,7 @@
=
f
.
label
:twitter
,
class:
"control-label"
.col-sm-10
=
f
.
text_field
:twitter
,
class:
"form-control"
.form-group
=
f
.
label
:website_url
,
class:
"control-label"
=
f
.
label
:website_url
,
'Website'
,
class:
"control-label"
.col-sm-10
=
f
.
text_field
:website_url
,
class:
"form-control"
.form-group
=
f
.
label
:bio
,
class:
"control-label"
...
...
app/views/users/_profile.html.haml
View file @
b04d6c2e
...
...
@@ -19,7 +19,7 @@
%strong
=
link_to
user
.
twitter
,
"http://www.twitter.com/
#{
user
.
twitter
}
"
-
unless
user
.
website_url
.
blank?
%li
%span
.light
Website
url
:
%span
.light
Website:
%strong
=
link_to
user
.
short_website_url
,
user
.
full_website_url
-
unless
user
.
bio
.
blank?
%li
...
...
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