Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 12:08:24 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 12:08:24 +0300
commit728a207ea6a99a4bddc16dbbe82294d3fdb60fe4 (patch)
tree4bc3b6a859681de3bbeabd7bf2ec5ffd756f3a0a /app/views/registrations
parentea20020f71c7226d57b6449b1d9b6c6f1298223e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/registrations')
-rw-r--r--app/views/registrations/welcome.html.haml6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/views/registrations/welcome.html.haml b/app/views/registrations/welcome.html.haml
index 7b92f5070df..bc8d7ed10ef 100644
--- a/app/views/registrations/welcome.html.haml
+++ b/app/views/registrations/welcome.html.haml
@@ -1,5 +1,4 @@
-- content_for(:page_title, _('Welcome to GitLab @%{username}!') % { username: current_user.username })
-- max_name_length = 128
+- content_for(:page_title, _('Welcome to GitLab %{name}!') % { name: current_user.name })
.text-center.mb-3
= _('In order to tailor your experience with GitLab we<br>would like to know a bit more about you.').html_safe
.signup-box.p-3.mb-2
@@ -7,9 +6,6 @@
= form_for(current_user, url: users_sign_up_update_registration_path, html: { class: 'new_new_user gl-show-field-errors', 'aria-live' => 'assertive' }) do |f|
.devise-errors.mt-0
= render 'devise/shared/error_messages', resource: current_user
- .name.form-group
- = f.label :name, _('Full name'), class: 'label-bold'
- = f.text_field :name, class: 'form-control top js-block-emoji js-validate-length', :data => { :max_length => max_name_length, :max_length_message => s_('Name is too long (maximum is %{max_length} characters).') % { max_length: max_name_length }, :qa_selector => 'new_user_name_field' }, required: true, title: _('This field is required.')
.form-group
= f.label :role, _('Role'), class: 'label-bold'
= f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, {}, class: 'form-control'