diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 26891d34734..43043459745 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -152,7 +152,7 @@ class RegistrationsController < Devise::RegistrationsController end def sign_up_params - params.require(:user).permit(:username, :email, :email_confirmation, :name, :first_name, :last_name, :password) + params.require(:user).permit(:username, :email, :name, :first_name, :last_name, :password) end def resource_name diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb index f06f00a5c3f..2fc46f033dd 100644 --- a/app/services/users/build_service.rb +++ b/app/services/users/build_service.rb @@ -91,7 +91,6 @@ module Users def signup_params [ :email, - :email_confirmation, :password_automatically_set, :name, :first_name, diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 0da51d460e3..07ef9a7914a 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -20,9 +20,6 @@ .form-group = f.label :email, class: 'label-bold' = f.email_field :email, value: @invite_email, class: "form-control middle", data: { qa_selector: 'new_user_email_field' }, required: true, title: _("Please provide a valid email address.") - .form-group - = f.label :email_confirmation, class: 'label-bold' - = f.email_field :email_confirmation, class: "form-control middle", data: { qa_selector: 'new_user_email_confirmation_field' }, required: true, title: _("Please retype the email address.") .form-group.append-bottom-20#password-strength = f.label :password, class: 'label-bold' = f.password_field :password, class: "form-control bottom", data: { qa_selector: 'new_user_password_field' }, required: true, pattern: ".{#{@minimum_password_length},}", title: _("Minimum length is %{minimum_password_length} characters.") % { minimum_password_length: @minimum_password_length } diff --git a/changelogs/unreleased/nicolasdular-remove-confirmation-email.yml b/changelogs/unreleased/nicolasdular-remove-confirmation-email.yml new file mode 100644 index 00000000000..9d73d867ff5 --- /dev/null +++ b/changelogs/unreleased/nicolasdular-remove-confirmation-email.yml @@ -0,0 +1,5 @@ +--- +title: Remove email confirmation field on signup form +merge_request: 41813 +author: +type: changed diff --git a/config/environments/test.rb b/config/environments/test.rb index e08e2a34ff4..f3a7f894b73 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,5 @@ require 'gitlab/testing/request_blocker_middleware' +require 'gitlab/testing/robots_blocker_middleware' require 'gitlab/testing/request_inspector_middleware' require 'gitlab/testing/clear_process_memory_cache_middleware' require 'gitlab/utils' @@ -6,6 +7,7 @@ require 'gitlab/utils' Rails.application.configure do # Make sure the middleware is inserted first in middleware chain config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::RequestBlockerMiddleware) + config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::RobotsBlockerMiddleware) config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::RequestInspectorMiddleware) config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::ClearProcessMemoryCacheMiddleware) diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb index 2be6e535fee..b91a4622ce8 100644 --- a/config/initializers/8_devise.rb +++ b/config/initializers/8_devise.rb @@ -41,7 +41,7 @@ Devise.setup do |config| # Configure which authentication keys should be case-insensitive. # These keys will be downcased upon creating or modifying a user and when used # to authenticate or find a user. Default is :email. - config.case_insensitive_keys = [:email, :email_confirmation] + config.case_insensitive_keys = [:email] # Configure which authentication keys should have whitespace stripped. # These keys will have whitespace before and after removed upon creating or diff --git a/doc/api/README.md b/doc/api/README.md index 33b8acda5bb..53df4114a71 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -639,7 +639,7 @@ follows: ## Unknown route -When you try to access an API URL that does not exist you will receive 404 Not Found. +When you try to access an API URL that does not exist, you will receive 404 Not Found. ```http HTTP/1.1 404 Not Found diff --git a/doc/development/documentation/site_architecture/index.md b/doc/development/documentation/site_architecture/index.md index 63cd9959985..5d3af6721d1 100644 --- a/doc/development/documentation/site_architecture/index.md +++ b/doc/development/documentation/site_architecture/index.md @@ -227,11 +227,12 @@ for its search function. This is how it works: there's a JavaScript snippet which initiates DocSearch by using an API key and an index name (`gitlab`) that are needed for Algolia to show the results. -NOTE: **For GitLab employees:** -The credentials to access the Algolia dashboard are stored in 1Password. If you -want to receive weekly reports of the search usage, search the Google doc with +NOTE: **For GitLab Team Members:** +If you’re a GitLab Team Member, find credentials for the Algolia dashboard +in the shared [GitLab 1Password account](https://about.gitlab.com/handbook/security/#1password-for-teams). +To receive weekly reports of the search usage, search the Google doc with title `Email, Slack, and GitLab Groups and Aliases`, search for `docsearch`, -and add a comment with your email to be added to the alias that gets the weekly +and add a comment with your email. You'll be added to the alias that gets the weekly reports. ## Monthly release process (versions) diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index 1e70770856e..b5c5a199b1e 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -7,6 +7,9 @@ For working with internationalization (i18n), used tool for this task and there are a lot of applications that will help us to work with it. +TIP: **Tip:** +All `rake` commands described on this page must be run on a GitLab instance, usually GDK. + ## Setting up GitLab Development Kit (GDK) In order to be able to work on the [GitLab Community Edition](https://gitlab.com/gitlab-org/gitlab-foss) @@ -207,7 +210,7 @@ For the static text strings we suggest two patterns for using these translations ```javascript