summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-10 14:14:10 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-10 14:14:10 +0000
commit004b252890e30df47c51fe81b4293b5c46f3c58e (patch)
tree3c7f3abe6599218d8a8f719b456c40a6cfff64e0
parent9f3eb5e0d39191796992d4573b424c9b2f12630e (diff)
parentceeb43e92bfbaf601f0a379b76ca8a118c798745 (diff)
downloadgitlab-ce-004b252890e30df47c51fe81b4293b5c46f3c58e.tar.gz
Merge branch '29209-sign-up-form-name' into 'master'
Change label for name on sign up form Closes #29209 See merge request !9845
-rw-r--r--app/views/devise/shared/_signup_box.html.haml2
-rw-r--r--changelogs/unreleased/29209-sign-up-form-name.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml
index 30e63d991bb..a2f6a7ab1cb 100644
--- a/app/views/devise/shared/_signup_box.html.haml
+++ b/app/views/devise/shared/_signup_box.html.haml
@@ -4,7 +4,7 @@
.devise-errors
= devise_error_messages!
.form-group
- = f.label :name
+ = f.label :name, 'Full name'
= f.text_field :name, class: "form-control top", required: true, title: "This field is required."
.username.form-group
= f.label :username
diff --git a/changelogs/unreleased/29209-sign-up-form-name.yml b/changelogs/unreleased/29209-sign-up-form-name.yml
new file mode 100644
index 00000000000..e8e3a71f875
--- /dev/null
+++ b/changelogs/unreleased/29209-sign-up-form-name.yml
@@ -0,0 +1,4 @@
+---
+title: Change label for name on sign up form
+merge_request:
+author: