Add latest changes from gitlab-org/gitlab@master

doc/development/fe_guide/vue.md

@@ -284,7 +284,7 @@ need to test the rendered output. [Vue][vue-test] guide's to unit test show us e
 One should apply to be a Vue.js expert by opening an MR when the Merge Request's they create and review show:
-- Deep understanding of Vue and Vuex reactivy
+- Deep understanding of Vue and Vuex reactivity
 - Vue and Vuex code are structured according to both official and our guidelines
 - Full understanding of testing a Vue and Vuex application
 - Vuex code follows the [documented pattern](vuex.md#actions-pattern-request-and-receive-namespaces)

doc/user/project/pipelines/job_artifacts.md

@@ -103,8 +103,12 @@ It is possible to download the latest artifacts of a job via a well known URL
 so you can use it for scripting purposes.
 NOTE: **Note:**
-The latest artifacts are considered as the artifacts created by jobs in the
-latest pipeline that succeeded for the specific ref.
+The latest artifacts are created by jobs in the **most recent** successful pipeline
+for the specific ref. If you run two types of pipelines for the same ref, the latest
+artifact will be determined by timing. For example, if a branch pipeline created
+by merging a merge request runs at the same time as a scheduled pipeline, the
+latest artifact will be from the pipeline that completed most recently.
+
 Artifacts for other pipelines can be accessed with direct access to them.
 The structure of the URL to download the whole artifacts archive is the following:

doc/user/project/push_options.md

@@ -31,19 +31,25 @@ git push -o <push_option>
 ## Push options for GitLab CI/CD
-If the `ci.skip` push option is used, the commit will be pushed, but no [CI pipeline](../../ci/pipelines.md)
-will be created.
-| Push option | Description |
-| ----------- | ----------- |
-| `ci.skip`   | Do not create a CI pipeline for the latest push. |
-For example:
+You can use push options to skip a CI/CD pipeline, or pass environment variables.
+| Push option                    | Description                                                                                 |
+| ------------------------------ | ------------------------------------------------------------------------------------------- |
+| `ci.skip`                      | Do not create a CI pipeline for the latest push.                                            |
+| `ci.variable="<name>=<value>"` | Provide [environment variables](../../ci/variables/README.md) to be used in a CI pipeline, if one is created due to the push. |
+An example of using `ci.skip`:
 ```shell
 git push -o ci.skip
 ```
+An example of passing some environment variables for a pipeline:
+
+```shell
+git push -o ci.variable="MAX_RETRIES=10" -o ci.variable="MAX_TIME=600"
+```
+
 ## Push options for merge requests
 You can use Git push options to perform certain actions for merge requests at the same

qa/qa/page/main/login.rb

@@ -42,6 +42,10 @@ module QA
           element :login_page, required: true
         end
+        def can_sign_in?
+          has_element?(:sign_in_button)
+        end
+
         def sign_in_using_credentials(user: nil, skip_page_validation: false)
           # Don't try to log-in if we're already logged-in
           return if Page::Main::Menu.perform(&:signed_in?)

qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb

@@ -14,11 +14,11 @@ module QA
         Support::Retrier.retry_until(sleep_interval: 0.5) do
           Page::Main::Menu.perform(&:sign_out)
-          Page::Main::Login.perform(&:has_sign_in_tab?)
+          Page::Main::Login.perform(&:can_sign_in?)
         end
         Page::Main::Login.perform do |form|
-          expect(form.sign_in_tab?).to be(true)
+          expect(form.can_sign_in?).to be(true)
         end
       end
     end

qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb

 # frozen_string_literal: true
 module QA
-  context 'Manage', :orchestrated, :oauth do
+  # Failure issue: https://gitlab.com/gitlab-org/gitlab/issues/36305
+  context 'Manage', :orchestrated, :oauth, :skip do
     describe 'OAuth login' do
       it 'User logs in to GitLab with GitHub OAuth' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)

qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb

@@ -28,7 +28,8 @@ module QA
         end
       end
-      it 'creates a merge request with a milestone and label' do
+      # Failure issue (in master): https://gitlab.com/gitlab-org/gitlab/issues/37304
+      it 'creates a merge request with a milestone and label', :quarantine do
         gitlab_account_username = "@#{Runtime::User.username}"
         milestone = Resource::ProjectMilestone.fabricate_via_api! do |milestone|