From: Jerome Dalbert <jerome@rentify.com>
Date: Mon, 20 Jan 2014 13:05:19 +0000 (+0000)
Subject: Rename "Website url" labels to "Website"
X-Git-Tag: v6.5.0~11^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9697e5327fa4dbe84e35b750203480857c68efd0;p=wvm%2Fgitlab.git

Rename "Website url" labels to "Website"
---

diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index ebc68e2ea..881a043f3 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -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
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index f1ccc0005..523a07db4 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -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"
diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml
index 30a86ba01..7ffd43e83 100644
--- a/app/views/users/_profile.html.haml
+++ b/app/views/users/_profile.html.haml
@@ -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