Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/deprecated_notes.js

@@ -10,7 +10,7 @@ class-methods-use-this */
 deprecated_notes_spec.js is the spec for the legacy, jQuery notes application. It has nothing to do with the new, fancy Vue notes app.
  */
 
-import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
+import { GlSkeletonLoader } from '@gitlab/ui';
 import Autosize from 'autosize';
 import $ from 'jquery';
 import { escape, uniqueId } from 'lodash';
@@ -1233,10 +1233,10 @@ export default class Notes {
     new Vue({
       el,
       components: {
-        GlSkeletonLoading,
+        GlSkeletonLoader,
       },
       render(createElement) {
-        return createElement('gl-skeleton-loading');
+        return createElement('gl-skeleton-loader');
       },
     });
   }

app/assets/javascripts/runner/admin_runners/admin_runners_app.vue

@@ -11,7 +11,7 @@ import {
   fromSearchToVariables,
   isSearchFiltered,
 } from 'ee_else_ce/runner/runner_search_utils';
-import runnersAdminQuery from 'ee_else_ce/runner/graphql/list/admin_runners.query.graphql';
+import allRunnersQuery from 'ee_else_ce/runner/graphql/list/all_runners.query.graphql';
 
 import RegistrationDropdown from '../components/registration/registration_dropdown.vue';
 import RunnerFilteredSearchBar from '../components/runner_filtered_search_bar.vue';
@@ -64,7 +64,7 @@ export default {
   },
   apollo: {
     runners: {
-      query: runnersAdminQuery,
+      query: allRunnersQuery,
       fetchPolicy: fetchPolicies.NETWORK_ONLY,
       variables() {
         return this.variables;

app/assets/javascripts/runner/components/stat/runner_count.vue

@@ -1,7 +1,7 @@
 <script>
 import { fetchPolicies } from '~/lib/graphql';
 import { captureException } from '../../sentry_utils';
-import runnersAdminCountQuery from '../../graphql/list/admin_runners_count.query.graphql';
+import allRunnersCountQuery from '../../graphql/list/all_runners_count.query.graphql';
 import groupRunnersCountQuery from '../../graphql/list/group_runners_count.query.graphql';
 import { INSTANCE_TYPE, GROUP_TYPE } from '../../constants';
 
@@ -53,7 +53,7 @@ export default {
     count: {
       query() {
         if (this.scope === INSTANCE_TYPE) {
-          return runnersAdminCountQuery;
+          return allRunnersCountQuery;
         } else if (this.scope === GROUP_TYPE) {
           return groupRunnersCountQuery;
         }

app/assets/javascripts/runner/graphql/list/admin_runners.query.graphql renamed to app/assets/javascripts/runner/graphql/list/all_runners.query.graphql

@@ -1,7 +1,7 @@
 #import "ee_else_ce/runner/graphql/list/list_item.fragment.graphql"
 #import "~/graphql_shared/fragments/page_info.fragment.graphql"
 
-query getRunners(
+query getAllRunners(
   $before: String
   $after: String
   $first: Int

app/assets/javascripts/runner/graphql/list/admin_runners_count.query.graphql renamed to app/assets/javascripts/runner/graphql/list/all_runners_count.query.graphql

@@ -1,4 +1,4 @@
-query getRunnersCount(
+query getAllRunnersCount(
   $paused: Boolean
   $status: CiRunnerStatus
   $type: CiRunnerType

app/helpers/groups_helper.rb

@@ -126,7 +126,7 @@ def render_setting_to_allow_project_access_token_creation?(group)
     group.root? && current_user.can?(:admin_setting_to_allow_project_access_token_creation, group)
   end
 
-  def show_thanks_for_purchase_banner?
+  def show_thanks_for_purchase_alert?
     params.key?(:purchased_quantity) && params[:purchased_quantity].to_i > 0
   end
 

app/services/work_items/create_service.rb

@@ -33,9 +33,12 @@ def execute
     end
 
     def transaction_create(work_item)
-      super
-
-      execute_widgets(work_item: work_item, callback: :after_create_in_transaction, widget_params: @widget_params)
+      super.tap do |save_result|
+        if save_result
+          execute_widgets(work_item: work_item, callback: :after_create_in_transaction,
+                          widget_params: @widget_params)
+        end
+      end
     end
 
     private

app/views/groups/show.html.haml

@@ -3,8 +3,8 @@
 - @skip_current_level_breadcrumb = true
 - add_page_specific_style 'page_bundles/group'
 
-- if show_thanks_for_purchase_banner?
-  = render_if_exists 'shared/thanks_for_purchase_banner', plan_title: plan_title, quantity: params[:purchased_quantity].to_i
+- if show_thanks_for_purchase_alert?
+  = render_if_exists 'shared/thanks_for_purchase_alert', plan_title: plan_title, quantity: params[:purchased_quantity].to_i
 
 = render_if_exists 'shared/qrtly_reconciliation_alert', group: @group
 = render_if_exists 'shared/free_user_cap_alert', source: @group

app/views/projects/triggers/_form.html.haml

@@ -1,5 +1,5 @@
 = form_for [@project, @trigger], html: { class: 'gl-show-field-errors' } do |f|
-  = form_errors(@trigger)
+  = form_errors(@trigger, pajamas_alert: true)
 
   - if @trigger.token
     .form-group

app/views/shared/deploy_keys/_project_group_form.html.haml

@@ -1,5 +1,5 @@
 = gitlab_ui_form_for [@project.namespace, @project, @deploy_keys.new_key], url: namespace_project_deploy_keys_path, html: { class: "js-requires-input container" } do |f|
-  = form_errors(@deploy_keys.new_key)
+  = form_errors(@deploy_keys.new_key, pajamas_alert: true)
   .form-group.row
     = f.label :title, class: "label-bold"
     = f.text_field :title, class: 'form-control gl-form-input', required: true, data: { qa_selector: 'deploy_key_title_field' }

doc/administration/geo/replication/troubleshooting.md

@@ -651,8 +651,11 @@ to start again from scratch, there are a few steps that can help you:
 
 1. Reset the Tracking Database.
 
+   WARNING:
+   If you skipped the optional step 3, be sure both `geo-postgresql` and `postgresql` services are running.
+
    ```shell
-   gitlab-rake db:drop:geo    # on a secondary app node
+   gitlab-rake db:drop:geo DISABLE_DATABASE_ENVIRONMENT_CHECK=1   # on a secondary app node
    gitlab-ctl reconfigure     # on the tracking database node
    gitlab-rake db:migrate:geo # on a secondary app node
    ```

doc/user/application_security/index.md

@@ -502,6 +502,8 @@ Feedback is welcome on our vision for [unifying the user experience for these tw
 
 ## Troubleshooting
 
+<!-- NOTE: The below subsection(`### Secure job failing with exit code 1`) documentation URL is referred in the [/gitlab-org/security-products/analyzers/command](https://gitlab.com/gitlab-org/security-products/analyzers/command/-/blob/main/command.go#L19) repository. If this section/subsection changes, please ensure to update the corresponding URL in the mentioned repository.
+-->
 ### Secure job failing with exit code 1
 
 If a Secure job is failing and it's unclear why, add `SECURE_LOG_LEVEL: "debug"` as a global CI/CD variable for

lib/api/terraform/modules/v1/packages.rb

@@ -115,6 +115,15 @@ def package_file
               redirect(download_path)
             end
 
+            get do
+              latest_package = packages.order_version.last
+
+              render_api_error!({ error: "No version found for #{params[:module_name]} module" }, :not_found) if latest_package&.version.nil?
+
+              presenter = ::Terraform::ModuleVersionPresenter.new(latest_package, params[:module_system])
+              present presenter, with: ::API::Entities::Terraform::ModuleVersion
+            end
+
             params do
               includes :module_version
             end

lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml

@@ -8,7 +8,7 @@ code_quality:
   variables:
     DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: ""
-    CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/ci-cd/codequality:0.85.26"
+    CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/ci-cd/codequality:0.85.29"
   needs: []
   script:
     - export SOURCE_CODE=$PWD

locale/gitlab.pot

@@ -11454,9 +11454,6 @@ msgstr ""
 msgid "CycleAnalyticsStage|should be under a group"
 msgstr ""
 
-msgid "CycleAnalytics|%{selectedLabelsCount} selected (%{maxLabels} max)"
-msgstr ""
-
 msgid "CycleAnalytics|'%{name}' is collecting the data. This can take a few minutes."
 msgstr ""
 
@@ -11481,9 +11478,6 @@ msgstr ""
 msgid "CycleAnalytics|Date"
 msgstr ""
 
-msgid "CycleAnalytics|Display chart filters"
-msgstr ""
-
 msgid "CycleAnalytics|If you have recently upgraded to GitLab Premium, it can take up to 30 minutes for data to collect and display."
 msgstr ""
 
@@ -11493,20 +11487,11 @@ msgstr ""
 msgid "CycleAnalytics|Number of tasks"
 msgstr ""
 
-msgid "CycleAnalytics|Only %{maxLabels} labels can be selected at this time"
-msgstr ""
-
 msgid "CycleAnalytics|Project selected"
 msgid_plural "CycleAnalytics|%d projects selected"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "CycleAnalytics|Select labels"
-msgstr ""
-
-msgid "CycleAnalytics|Show"
-msgstr ""
-
 msgid "CycleAnalytics|Stage time: %{title}"
 msgstr ""
 
@@ -36141,6 +36126,9 @@ msgstr ""
 msgid "Showing version #%{versionNumber}"
 msgstr ""
 
+msgid "Shows issues and %{labels_count} label for group '%{group_name}' from Nov 1, 2019 to Dec 31, 2019"
+msgstr ""
+
 msgid "Shows issues and %{labels_count} labels for group '%{group_name}' from Nov 1, 2019 to Dec 31, 2019"
 msgstr ""
 
@@ -37596,9 +37584,6 @@ msgstr ""
 msgid "Succeeded"
 msgstr ""
 
-msgid "Successful purchase image"
-msgstr ""
-
 msgid "Successfully activated"
 msgstr ""
 

qa/qa/page/project/web_ide/edit.rb

@@ -192,7 +192,7 @@ def commit_sha
             find_element(:commit_sha_content).text
           end
 
-          def commit_changes(commit_message = nil, open_merge_request: false)
+          def commit_changes(commit_message = nil, open_merge_request: false, wait_for_success: true)
             # Clicking :begin_commit_button switches from the
             # edit to the commit view
             click_element(:begin_commit_button)
@@ -226,13 +226,17 @@ def commit_changes(commit_message = nil, open_merge_request: false)
                 end
                 click_element(:commit_button) if has_element?(:commit_button)
 
+                break unless wait_for_success
+
                 # If this is the first commit, the commit SHA only appears after reloading
                 wait_until(reload: true) do
                   active_element?(:edit_mode_tab) && commit_sha != original_commit
                 end
               end
 
-              raise "The changes do not appear to have been committed successfully." unless commit_success
+              if wait_for_success
+                raise "The changes do not appear to have been committed successfully." unless commit_success
+              end
             end
           end
 

qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Create', :skip_live_env, except: { job: 'review-qa-*' } do
+    describe 'Git Server Hooks' do
+      let(:file_path) { File.absolute_path(File.join('qa', 'fixtures', 'web_ide', 'README.md')) }
+
+      let(:project) do
+        Resource::Project.fabricate_via_api! do |project|
+          # Projects that have names that include pattern 'reject-prereceive' trigger a server hook on orchestrated env
+          # that returns an error string using GL-HOOK-ERR
+          project.name = "project-reject-prereceive-#{SecureRandom.hex(8)}"
+        end
+      end
+
+      before do
+        Flow::Login.sign_in
+        project.visit!
+      end
+
+      context 'Custom error messages' do
+        it 'renders preconfigured error message when user hook failed on commit in WebIDE',
+           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/364751' do
+          Page::Project::Show.perform(&:open_web_ide_via_shortcut)
+          Page::Project::WebIDE::Edit.perform do |ide|
+            ide.upload_file(file_path)
+            ide.commit_changes(wait_for_success: false)
+            expect(ide).to have_text('Custom error message rejecting prereceive hook for projects with GL_PROJECT_PATH')
+          end
+        end
+      end
+    end
+  end
+end

spec/features/groups_spec.rb

@@ -22,7 +22,7 @@
     end
 
     describe 'as a non-admin' do
-      it 'creates a group and persists visibility radio selection', :js, :saas do
+      it 'creates a group and persists visibility radio selection', :js do
         stub_application_setting(default_group_visibility: :private)
 
         fill_in 'Group name', with: 'test-group'

spec/frontend/fixtures/runner.rb

@@ -39,33 +39,33 @@
     end
 
     describe GraphQL::Query, type: :request do
-      admin_runners_query = 'list/admin_runners.query.graphql'
+      all_runners_query = 'list/all_runners.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{admin_runners_query}")
+        get_graphql_query_as_string("#{query_path}#{all_runners_query}")
       end
 
-      it "#{fixtures_path}#{admin_runners_query}.json" do
+      it "#{fixtures_path}#{all_runners_query}.json" do
         post_graphql(query, current_user: admin, variables: {})
 
         expect_graphql_errors_to_be_empty
       end
 
-      it "#{fixtures_path}#{admin_runners_query}.paginated.json" do
+      it "#{fixtures_path}#{all_runners_query}.paginated.json" do
         post_graphql(query, current_user: admin, variables: { first: 2 })
 
         expect_graphql_errors_to_be_empty
       end
     end
 
     describe GraphQL::Query, type: :request do
-      admin_runners_count_query = 'list/admin_runners_count.query.graphql'
+      all_runners_count_query = 'list/all_runners_count.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{admin_runners_count_query}")
+        get_graphql_query_as_string("#{query_path}#{all_runners_count_query}")
       end
 
-      it "#{fixtures_path}#{admin_runners_count_query}.json" do
+      it "#{fixtures_path}#{all_runners_count_query}.json" do
         post_graphql(query, current_user: admin, variables: {})
 
         expect_graphql_errors_to_be_empty