Add latest changes from gitlab-org/gitlab@master

.gitlab/issue_templates/Coding style proposal.md

@@ -11,6 +11,6 @@ Please describe the proposal and add a link to the source (for example, http://w
 /label ~"development guidelines"
 /label ~"Style decision"
-/label ~Documentation
+/label ~documentation
 /cc @gitlab-org/maintainers/rails-backend

.gitlab/issue_templates/Doc Review.md

@@ -8,13 +8,13 @@
 ## References
-Merged MR that introduced documentation requiring review: 
-Related issue(s): 
+Merged MR that introduced documentation requiring review:
+Related issue(s):
 ## Further Details
 <!-- Any additional context, questions, or notes for the technical writer. -->
-/label ~Documentation ~docs-review
+/label ~documentation ~"Technical Writing"

.gitlab/issue_templates/Documentation.md

@@ -2,23 +2,13 @@
 * Use this issue template for suggesting new docs or updates to existing docs.
   Note: Doc work as part of feature development is covered in the Feature Request template.
-  
+
 * For issues related to features of the docs.gitlab.com site, see
-     https://gitlab.com/gitlab-org/gitlab-docs/issues/       
+     https://gitlab.com/gitlab-org/gitlab-docs/issues/
 * For information about documentation content and process, see
      https://docs.gitlab.com/ee/development/documentation/ -->
-<!-- Type of issue -->
-
-<!-- Un-comment the line for the applicable doc issue type to add its label.
-     Note that all text on that line is deleted upon issue creation. -->
-<!-- /label ~"docs:fix" - Correction or clarification needed. -->
-<!-- /label ~"docs:new" - New doc needed to cover a new topic or use case. -->
-<!-- /label ~"docs:improvement" - Improving an existing doc; e.g. adding a diagram, adding or rewording text, resolving redundancies, cross-linking, etc. -->
-<!-- /label ~"docs:revamp" - Review a page or group of pages in order to plan and implement major improvements/rewrites. -->
-<!-- /label ~"docs:other" - Anything else. -->
-
 ### Problem to solve
 <!-- Include the following detail as necessary:
@@ -50,4 +40,4 @@
 <!-- E.g. related GitLab issues/MRs -->
-/label ~Documentation
+/label ~documentation

.gitlab/merge_request_templates/Change documentation location.md

@@ -10,12 +10,12 @@
 <!-- Mention the issue(s) this MR closes or is related to -->
-Closes 
+Closes
 ## Moving docs to a new location?
 Read the guidelines:
-https://docs.gitlab.com/ce/development/documentation/index.html#changing-document-location
+https://docs.gitlab.com/ee/development/documentation/index.html#changing-document-location
 - [ ] Make sure the old link is not removed and has its contents replaced with
       a link to the new location.
@@ -29,4 +29,4 @@ https://docs.gitlab.com/ce/development/documentation/index.html#changing-documen
       with the changes as well (https://docs.gitlab.com/ce/development/documentation/index.html#cherry-picking-from-ce-to-ee).
 - [ ] Ping one of the technical writers for review.
-/label ~Documentation
+/label ~documentation

.gitlab/merge_request_templates/Documentation.md

 <!-- Follow the documentation workflow https://docs.gitlab.com/ee/development/documentation/workflow.html -->
-<!-- Additional information is located at https://docs.gitlab.com/ee/development/documentation/ --> 
+<!-- Additional information is located at https://docs.gitlab.com/ee/development/documentation/ -->
 <!-- Mention "documentation" or "docs" in the MR title -->
 <!-- For changing documentation location use the "Change documentation location" template -->
@@ -26,7 +26,7 @@ All reviewers can help ensure accuracy, clarity, completeness, and adherence to
 **1. Primary Reviewer**
 * [ ] Review by a code reviewer or other selected colleague to confirm accuracy, clarity, and completeness. This can be skipped for minor fixes without substantive content changes.
- 
+
 **2. Technical Writer**
 * [ ] Optional: Technical writer review. If not requested for this MR, must be scheduled post-merge. To request for this MR, assign the writer listed for the applicable [DevOps stage](https://about.gitlab.com/handbook/product/categories/#devops-stages).
@@ -37,4 +37,4 @@ All reviewers can help ensure accuracy, clarity, completeness, and adherence to
 1. [ ] Ensure a release milestone is set and that you merge the equivalent EE MR before the CE MR if both exist.
 1. [ ] If there has not been a technical writer review, [create an issue for one using the Doc Review template](https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issuable_template=Doc%20Review).
-/label ~Documentation
+/label ~documentation

app/views/admin/users/_head.html.haml

@@ -10,7 +10,7 @@
   .float-right
     - if impersonation_enabled? && @user != current_user && @user.can?(:log_in)
-      = link_to 'Impersonate', impersonate_admin_user_path(@user), method: :post, class: "btn btn-nr btn-grouped btn-info"
+      = link_to 'Impersonate', impersonate_admin_user_path(@user), method: :post, class: "btn btn-nr btn-grouped btn-info", data: { qa_selector: 'impersonate_user_link' }
     = link_to edit_admin_user_path(@user), class: "btn btn-nr btn-grouped" do
       %i.fa.fa-pencil-square-o
       Edit

app/views/admin/users/_user.html.haml

-.gl-responsive-table-row{ role: 'row' }
+.gl-responsive-table-row{ role: 'row', data: { qa_selector: 'user_row_content' } }
   .table-section.section-40
     .table-mobile-header{ role: 'rowheader' }
       = _('Name')

app/views/admin/users/_user_detail.html.haml

@@ -4,7 +4,7 @@
     .row-main-content
       .row-title.str-truncated-100
         = image_tag avatar_icon_for_user(user), class: 'avatar s16 d-xs-flex d-md-none mr-1 prepend-top-2', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) }
-        = link_to user.name, admin_user_path(user), class: 'text-plain js-user-link', data: { user_id: user.id }
+        = link_to user.name, admin_user_path(user), class: 'text-plain js-user-link', data: { user_id: user.id, qa_selector: 'username_link' }
       = render_if_exists 'admin/users/user_listing_note', user: user

app/views/admin/users/index.html.haml

@@ -44,7 +44,7 @@
       = hidden_field_tag "filter", h(params[:filter])
     .search-holder
       .search-field-holder
-        = search_field_tag :search_query, params[:search_query], placeholder: s_('AdminUsers|Search by name, email or username'), class: 'form-control search-text-input js-search-input', spellcheck: false
+        = search_field_tag :search_query, params[:search_query], placeholder: s_('AdminUsers|Search by name, email or username'), class: 'form-control search-text-input js-search-input', spellcheck: false, data: { qa_selector: 'user_search_field' }
         - if @sort.present?
           = hidden_field_tag :sort, @sort
         = icon("search", class: "search-icon")

app/views/layouts/header/_default.html.haml

@@ -73,7 +73,7 @@
                 = render 'layouts/header/current_user_dropdown'
           - if has_impersonation_link
             %li.nav-item.impersonation.ml-0
-              = link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
+              = link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body', qa_selector: 'stop_impersonation_link' } do
                 = icon('user-secret')
           - if header_link?(:sign_in)
             %li.nav-item

app/views/layouts/nav/sidebar/_admin.html.haml

@@ -6,7 +6,7 @@
           = sprite_icon('admin', size: 24)
         .sidebar-context-title
           = _('Admin Area')
-    %ul.sidebar-top-level-items
+    %ul.sidebar-top-level-items{ data: { qa_selector: 'admin_sidebar_overview_submenu_content' } }
       = nav_link(controller: %w(dashboard admin admin/projects users groups jobs runners gitaly_servers), html_options: {class: 'home'}) do
         = link_to admin_root_path, class: 'shortcuts-tree' do
           .nav-icon-container
@@ -28,7 +28,7 @@
               %span
                 = _('Projects')
           = nav_link(controller: :users) do
-            = link_to admin_users_path, title: _('Users') do
+            = link_to admin_users_path, title: _('Users') , data: { qa_selector: 'users_overview_link' } do
               %span
                 = _('Users')
           = nav_link(controller: :groups) do
@@ -49,13 +49,13 @@
                 = _('Gitaly Servers')
       = nav_link(controller: admin_monitoring_nav_links) do
-        = link_to admin_system_info_path do
+        = link_to admin_system_info_path, data: { qa_selector: 'admin_monitoring_link' } do
           .nav-icon-container
             = sprite_icon('monitor')
           %span.nav-item-name
             = _('Monitoring')
-        %ul.sidebar-sub-level-items
+        %ul.sidebar-sub-level-items{ data: { qa_selector: 'admin_sidebar_monitoring_submenu_content' } }
           = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles), html_options: { class: "fly-out-top-item" } ) do
             = link_to admin_system_info_path do
               %strong.fly-out-top-item-name
@@ -225,7 +225,7 @@
           %span.nav-item-name.qa-admin-settings-item
             = _('Settings')
-        %ul.sidebar-sub-level-items.qa-admin-sidebar-submenu
+        %ul.sidebar-sub-level-items.qa-admin-sidebar-settings-submenu
           = nav_link(controller: :application_settings, html_options: { class: "fly-out-top-item" } ) do
             = link_to admin_application_settings_path do
               %strong.fly-out-top-item-name

app/views/layouts/nav/sidebar/_profile.html.haml

@@ -64,7 +64,7 @@
               %strong.fly-out-top-item-name
                 = _('Access Tokens')
       = nav_link(controller: :emails) do
-        = link_to profile_emails_path do
+        = link_to profile_emails_path, data: { qa_selector: 'profile_emails_link' } do
           .nav-icon-container
             = sprite_icon('mail')
           %span.nav-item-name
@@ -76,7 +76,7 @@
                 = _('Emails')
       - if current_user.allow_password_authentication?
         = nav_link(controller: :passwords) do
-          = link_to edit_profile_password_path do
+          = link_to edit_profile_password_path , data: { qa_selector: 'profile_password_link' } do
             .nav-icon-container
               = sprite_icon('lock')
             %span.nav-item-name

app/views/profiles/emails/index.html.haml

@@ -13,9 +13,9 @@
     = form_for 'email', url: profile_emails_path do |f|
       .form-group
         = f.label :email, _('Email'), class: 'label-bold'
-        = f.text_field :email, class: 'form-control'
+        = f.text_field :email, class: 'form-control', data: { qa_selector: 'email_address_field' }
       .prepend-top-default
-        = f.submit _('Add email address'), class: 'btn btn-success'
+        = f.submit _('Add email address'), class: 'btn btn-success', data: { qa_selector: 'add_email_address_button' }
     %hr
     %h4.prepend-top-0
       = _('Linked emails (%{email_count})') % { email_count: @emails.count + 1 }
@@ -45,7 +45,7 @@
           - if @primary_email === current_user.notification_email
             %span.badge.badge-info= s_('Profiles|Default notification email')
       - @emails.each do |email|
-        %li
+        %li{ data: { qa_selector: 'email_row_content' } }
           = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? }
           %span.float-right
             - if email.email === current_user.commit_email
@@ -58,6 +58,6 @@
               - confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}"
               = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'btn btn-sm btn-warning prepend-left-10'
-            = link_to profile_email_path(email), data: { confirm: _('Are you sure?')}, method: :delete, class: 'btn btn-sm btn-danger prepend-left-10' do
+            = link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'btn btn-sm btn-danger prepend-left-10' do
               %span.sr-only= _('Remove')
               = icon('trash')

app/views/profiles/passwords/edit.html.haml

@@ -20,16 +20,16 @@
       - unless @user.password_automatically_set?
         .form-group
           = f.label :current_password, _('Current password'), class: 'label-bold'
-          = f.password_field :current_password, required: true, class: 'form-control'
+          = f.password_field :current_password, required: true, class: 'form-control', data: { qa_selector: 'current_password_field' }
           %p.form-text.text-muted
             = _('You must provide your current password in order to change it.')
       .form-group
         = f.label :password, _('New password'), class: 'label-bold'
-        = f.password_field :password, required: true, class: 'form-control'
+        = f.password_field :password, required: true, class: 'form-control', data: { qa_selector: 'new_password_field' }
       .form-group
         = f.label :password_confirmation, _('Password confirmation'), class: 'label-bold'
-        = f.password_field :password_confirmation, required: true, class: 'form-control'
+        = f.password_field :password_confirmation, required: true, class: 'form-control', data: { qa_selector: 'confirm_password_field' }
       .prepend-top-default.append-bottom-default
-        = f.submit _('Save password'), class: "btn btn-success append-right-10"
+        = f.submit _('Save password'), class: "btn btn-success append-right-10", data: { qa_selector: 'save_password_button' }
         - unless @user.password_automatically_set?
           = link_to _('I forgot my password'), reset_profile_password_path, method: :put, class: "account-btn-link"

danger/documentation/Dangerfile

@@ -20,8 +20,8 @@ unless docs_paths_to_review.empty?
       - [Documentation workflows](https://docs.gitlab.com/ee/development/documentation/workflow.html) for information on when to assign a merge request for review.
     MARKDOWN
-    unless gitlab.mr_labels.include?('Documentation')
-      warn 'This merge request is missing the ~Documentation label.'
+    unless gitlab.mr_labels.include?('documentation')
+      warn 'This merge request is missing the ~documentation label.'
     end
   end
 end

doc/administration/geo/disaster_recovery/index.md

@@ -51,7 +51,7 @@ must disable the **primary** node.
    NOTE: **Note:**
    (**CentOS only**) In CentOS 6 or older, there is no easy way to prevent GitLab from being
-   started if the machine reboots isn't available (see [gitlab-org/omnibus-gitlab#3058]).
+   started if the machine reboots isn't available (see [Omnibus GitLab issue #3058](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3058)).
    It may be safest to uninstall the GitLab package completely:
    ```sh
@@ -317,6 +317,5 @@ section to resolve the error. Otherwise, the secret is lost and you'll need to
 [setup-geo]: ../replication/index.md#setup-instructions
 [updating-geo]: ../replication/version_specific_updates.md#updating-to-gitlab-105
 [sec-tfa]: ../../../security/two_factor_authentication.md#disabling-2fa-for-everyone
-[gitlab-org/omnibus-gitlab#3058]: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3058
 [initiate-the-replication-process]: ../replication/database.html#step-3-initiate-the-replication-process
 [configure-the-primary-server]: ../replication/database.html#step-1-configure-the-primary-server

doc/administration/geo/replication/configuration.md

@@ -25,7 +25,7 @@ Any change that requires access to the **Admin Area** needs to be done in the
 GitLab stores a number of secret values in the `/etc/gitlab/gitlab-secrets.json`
 file which *must* be the same on all nodes. Until there is
-a means of automatically replicating these between nodes (see issue [gitlab-org/gitlab#3789]),
+a means of automatically replicating these between nodes (see [issue #3789](https://gitlab.com/gitlab-org/gitlab/issues/3789)),
 they must be manually replicated to the **secondary** node.
 1. SSH into the **primary** node, and execute the command below:
@@ -75,7 +75,7 @@ they must be manually replicated to the **secondary** node.
 ### Step 2. Manually replicate the **primary** node's SSH host keys
 GitLab integrates with the system-installed SSH daemon, designating a user
-(typically named git) through which all access requests are handled.
+(typically named `git`) through which all access requests are handled.
 In a [Disaster Recovery] situation, GitLab system
 administrators will promote a **secondary** node to the **primary** node. DNS records for the
@@ -299,7 +299,6 @@ See the [troubleshooting document](troubleshooting.md).
 [setup-geo-omnibus]: index.md#using-omnibus-gitlab
 [Hashed Storage]: ../../repository_storage_types.md
 [Disaster Recovery]: ../disaster_recovery/index.md
-[gitlab-org/gitlab#3789]: https://gitlab.com/gitlab-org/gitlab/issues/3789
 [gitlab-com/infrastructure#2821]: https://gitlab.com/gitlab-com/infrastructure/issues/2821
 [omnibus-ssl]: https://docs.gitlab.com/omnibus/settings/ssl.html
 [using-geo]: using_a_geo_server.md

doc/administration/geo/replication/database.md

@@ -443,15 +443,15 @@ data before running `pg_basebackup`.
 The replication process is now complete.
-## PGBouncer support (optional)
-[PGBouncer](http://pgbouncer.github.io/) may be used with GitLab Geo to pool
-PostgreSQL connections. We recommend using PGBouncer if you use GitLab in a
+## PgBouncer support (optional)
+[PgBouncer](http://pgbouncer.github.io/) may be used with GitLab Geo to pool
+PostgreSQL connections. We recommend using PgBouncer if you use GitLab in a
 high-availability configuration with a cluster of nodes supporting a Geo
 **primary** node and another cluster of nodes supporting a Geo **secondary** node. For more
 information, see [High Availability with GitLab Omnibus](../../high_availability/database.md#high-availability-with-gitlab-omnibus-premium-only).
-For a Geo **secondary** node to work properly with PGBouncer in front of the database,
+For a Geo **secondary** node to work properly with PgBouncer in front of the database,
 it will need a separate read-only user to make [PostgreSQL FDW queries][FDW]
 work:

doc/administration/geo/replication/faq.md

@@ -43,9 +43,9 @@ attachments / avatars and the whole database. This means user accounts,
 issues, merge requests, groups, project data, etc., will be available for
 query.
-## Can I git push to a **secondary** node?
-Yes!  Pushing directly to a **secondary** node (for both HTTP and SSH, including git-lfs) was [introduced](https://about.gitlab.com/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
+## Can I `git push` to a **secondary** node?
+Yes!  Pushing directly to a **secondary** node (for both HTTP and SSH, including Git LFS) was [introduced](https://about.gitlab.com/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
 ## How long does it take to have a commit replicated to a **secondary** node?

doc/administration/geo/replication/high_availability.md

@@ -8,7 +8,7 @@ described, it is possible to adapt these instructions to your needs.
 ![Geo HA Diagram](../../high_availability/img/geo-ha-diagram.png)
-_[diagram source - gitlab employees only][diagram-source]_
+_[diagram source - GitLab employees only][diagram-source]_
 The topology above assumes that the **primary** and **secondary** Geo clusters
 are located in two separate locations, on their own virtual network
@@ -274,15 +274,15 @@ After making these changes [Reconfigure GitLab][gitlab-reconfigure] so the chang
 On the secondary the following GitLab frontend services will be enabled:
-- geo-logcursor
-- gitlab-pages
-- gitlab-workhorse
-- logrotate
-- nginx
-- registry
-- remote-syslog
-- sidekiq
-- unicorn
+- `geo-logcursor`
+- `gitlab-pages`
+- `gitlab-workhorse`
+- `logrotate`
+- `nginx`
+- `registry`
+- `remote-syslog`
+- `sidekiq`
+- `unicorn`
 Verify these services by running `sudo gitlab-ctl status` on the frontend
 application servers.