Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue

@@ -32,12 +32,12 @@ export default {
     },
   },
   deployedTextMap: {
-    [MANUAL_DEPLOY]: __('Can deploy manually to'),
+    [MANUAL_DEPLOY]: __('Can be manually deployed to'),
     [WILL_DEPLOY]: __('Will deploy to'),
     [RUNNING]: __('Deploying to'),
     [SUCCESS]: __('Deployed to'),
     [FAILED]: __('Failed to deploy to'),
-    [CANCELED]: __('Canceled deploy to'),
+    [CANCELED]: __('Canceled deployment to'),
   },
   computed: {
     deployTimeago() {

app/assets/javascripts/vue_shared/components/bar_chart.vue

@@ -124,7 +124,9 @@ export default {
     },
   },
   mounted() {
-    this.draw();
+    if (!this.allValuesEmpty) {
+      this.draw();
+    }
   },
   methods: {
     draw() {
@@ -151,14 +153,7 @@ export default {
       this.yScale = d3.scaleLinear().rangeRound([this.vbHeight, 0]);
 
       this.xScale.domain(this.graphData.map(d => d.name));
-      /*
-      If we have all-zero graph we want graph to center 0 on axis and not to draw
-      any kind of ticks on Y axis. Infinity allows us to do that.
-
-      See https://gitlab.com/gitlab-org/gitlab/merge_requests/20627#note_251484582
-      for detailed explanation
-      */
-      this.yScale.domain([0, d3.max(this.graphData.map(d => d.value)) || Infinity]);
+      this.yScale.domain([0, d3.max(this.graphData.map(d => d.value))]);
 
       // Zoom/Panning Function
       this.zoom = d3

app/helpers/sidekiq_helper.rb

@@ -5,7 +5,7 @@ module SidekiqHelper
     (?<pid>\d+)\s+
     (?<cpu>[\d\.,]+)\s+
     (?<mem>[\d\.,]+)\s+
-    (?<state>[DIEKNRSTVWXZNLpsl\+<>/\d]+)\s+
+    (?<state>[DIEKNRSTVWXZLpsl\+<>/\d]+)\s+
     (?<start>.+?)\s+
     (?<command>(?:ruby\d+:\s+)?sidekiq.*\].*)
     \z}x.freeze

app/models/project.rb

@@ -2203,7 +2203,7 @@ class Project < ApplicationRecord
   end
 
   def reference_counter(type: Gitlab::GlRepository::PROJECT)
-    Gitlab::ReferenceCounter.new(type.identifier_for_subject(self))
+    Gitlab::ReferenceCounter.new(type.identifier_for_repositorable(self))
   end
 
   def badges

app/models/project_services/pipelines_email_service.rb

@@ -100,6 +100,6 @@ class PipelinesEmailService < Service
   end
 
   def retrieve_recipients(data)
-    recipients.to_s.split(/[,(?:\r?\n) ]+/).reject(&:empty?)
+    recipients.to_s.split(/[,\r\n ]+/).reject(&:empty?)
   end
 end

app/models/project_wiki.rb

@@ -65,7 +65,7 @@ class ProjectWiki
   # Returns the Gitlab::Git::Wiki object.
   def wiki
     @wiki ||= begin
-      gl_repository = Gitlab::GlRepository::WIKI.identifier_for_subject(project)
+      gl_repository = Gitlab::GlRepository::WIKI.identifier_for_repositorable(project)
       raw_repository = Gitlab::Git::Repository.new(project.repository_storage, disk_path + '.git', gl_repository, full_path)
 
       create_repo!(raw_repository) unless raw_repository.exists?

app/models/repository.rb

@@ -1177,7 +1177,7 @@ class Repository
   def initialize_raw_repository
     Gitlab::Git::Repository.new(project.repository_storage,
                                 disk_path + '.git',
-                                repo_type.identifier_for_subject(project),
+                                repo_type.identifier_for_repositorable(project),
                                 project.full_path)
   end
 end

changelogs/unreleased/196861-improve-pipelines-copy.yml

+---
+title: Update pipeline status copy in deploy footer
+merge_request: 23199
+author:
+type: changed

changelogs/unreleased/9425-gitlab-npm-registry-to-support-npm-tags.yml

+---
+title: NPM dist tags will now be displayed on the package details page.
+merge_request: 23061
+author:
+type: added

changelogs/unreleased/sh-add-missing-backtrace-define.yml

+---
+title: Fix Bitbucket Server importer error handler
+merge_request: 23310
+author:
+type: fixed

config/environments/test.rb

@@ -10,11 +10,8 @@ Rails.application.configure do
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
 
-  # Enabling caching of classes slows start-up time because all controllers
-  # are loaded at initialization, but it reduces memory and load because files
-  # are not reloaded with every request. For example, caching is not necessary
-  # for loading database migrations but useful for handling Knapsack specs.
-  config.cache_classes = ENV['CACHE_CLASSES'] == 'true'
+  # Code doesn't change in CI so we don't need code-reloading
+  config.cache_classes = !!ENV['CI']
 
   # Configure static asset server for tests with Cache-Control for performance
   config.assets.compile = false if ENV['CI']

doc/install/aws/index.md

@@ -238,32 +238,7 @@ Now, it's time to create the database:
    auto updates to minor versions. You may want to turn it off.
 1. When done, click **Create database**.
 
-### Installing the `pg_trgm` extension for PostgreSQL
-
-Once the database is created, connect to your new RDS instance to verify access
-and to install a required extension.
-
-You can find the host or endpoint by selecting the instance you just created and
-after the details dropdown menu you'll find it labeled as 'Endpoint'. Do not to
-include the colon and port number:
-
-```sh
-sudo /opt/gitlab/embedded/bin/psql -U gitlab -h <rds-endpoint> -d gitlabhq_production
-```
-
-At the psql prompt create the extension and then quit the session:
-
-```sh
-psql (9.4.7)
-Type "help" for help.
-
-gitlab=# CREATE EXTENSION pg_trgm;
-gitlab=# \q
-```
-
----
-
-Now that the database is created, let's move on setting up Redis with ElasticCache.
+Now that the database is created, let's move on to setting up Redis with ElasticCache.
 
 ## Redis with ElastiCache
 
@@ -435,15 +410,32 @@ we intended.
 After a few minutes, the instances should be up and accessible via the internet.
 Let's connect to the primary and configure some things before logging in.
 
-### Configuring GitLab to connect with postgres and Redis
+### Installing the `pg_trgm` extension for PostgreSQL
+
+Connect to the RDS instance to verify access and to install the required `pg_trgm` extension.
+
+To find the host or endpoint, naviagate to **Amazon RDS > Databases** and click on the database you created earlier. Look for the endpoint under the **Connectivity & security** tab.
 
-While connected to your server, let's connect to the RDS instance to verify
-access and to install a required extension:
+Do not to include the colon and port number:
 
 ```sh
 sudo /opt/gitlab/embedded/bin/psql -U gitlab -h <rds-endpoint> -d gitlabhq_production
 ```
 
+At the psql prompt create the extension and then quit the session:
+
+```sh
+psql (10.9)
+Type "help" for help.
+
+gitlab=# CREATE EXTENSION pg_trgm;
+gitlab=# \q
+```
+
+---
+
+### Configuring GitLab to connect with postgres and Redis
+
 Edit the `gitlab.rb` file at `/etc/gitlab/gitlab.rb`
 find the `external_url 'http://gitlab.example.com'` option and change it
 to the domain you will be using or the public IP address of the current

lib/api/helpers/internal_helpers.rb

@@ -118,7 +118,7 @@ module API
       # Project id to pass between components that don't share/don't have
       # access to the same filesystem mounts
       def gl_repository
-        repo_type.identifier_for_subject(project)
+        repo_type.identifier_for_repositorable(project)
       end
 
       def gl_project_path

lib/gitlab/bitbucket_server_import/importer.rb

@@ -172,6 +172,7 @@ module Gitlab
               stage: 'import_pull_requests', iid: pull_request.iid, error: e.message
             )
 
+            backtrace = Gitlab::BacktraceCleaner.clean_backtrace(e.backtrace)
             errors << { type: :pull_request, iid: pull_request.iid, errors: e.message, backtrace: backtrace.join("\n"), raw_response: pull_request.raw }
           end
         end

lib/gitlab/gl_repository/repo_type.rb

@@ -13,8 +13,8 @@ module Gitlab
         @repository_accessor = repository_accessor
       end
 
-      def identifier_for_subject(subject)
-        "#{name}-#{subject.id}"
+      def identifier_for_repositorable(repositorable)
+        "#{name}-#{repositorable.id}"
       end
 
       def fetch_id(identifier)
@@ -34,8 +34,8 @@ module Gitlab
         project? ? "" : ".#{name}"
       end
 
-      def repository_for(subject)
-        repository_accessor.call(subject)
+      def repository_for(repositorable)
+        repository_accessor.call(repositorable)
       end
     end
   end

lib/gitlab/regex.rb

@@ -5,6 +5,9 @@ module Gitlab
     extend self
 
     def project_name_regex
+      # The character range \p{Alnum} overlaps with \u{00A9}-\u{1f9ff}
+      # hence the Ruby warning.
+      # https://gitlab.com/gitlab-org/gitlab/merge_requests/23165#not-easy-fixable
       @project_name_regex ||= /\A[\p{Alnum}\u{00A9}-\u{1f9ff}_][\p{Alnum}\p{Pd}\u{00A9}-\u{1f9ff}_\. ]*\z/.freeze
     end
 

lib/gitlab/workhorse.rb

@@ -24,7 +24,7 @@ module Gitlab
 
         attrs = {
           GL_ID: Gitlab::GlId.gl_id(user),
-          GL_REPOSITORY: repo_type.identifier_for_subject(repository.project),
+          GL_REPOSITORY: repo_type.identifier_for_repositorable(repository.project),
           GL_USERNAME: user&.username,
           ShowAllRefs: show_all_refs,
           Repository: repository.gitaly_repository.to_h,

locale/gitlab.pot

@@ -173,6 +173,11 @@ msgid_plural "%d staged changes"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%d tag"
+msgid_plural "%d tags"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d unstaged change"
 msgid_plural "%d unstaged changes"
 msgstr[0] ""
@@ -3081,7 +3086,7 @@ msgstr ""
 msgid "Callback URL"
 msgstr ""
 
-msgid "Can deploy manually to"
+msgid "Can be manually deployed to"
 msgstr ""
 
 msgid "Can override approvers and approvals required per merge request"
@@ -3114,7 +3119,7 @@ msgstr ""
 msgid "Cancel this job"
 msgstr ""
 
-msgid "Canceled deploy to"
+msgid "Canceled deployment to"
 msgstr ""
 
 msgid "Cancelling Preview"

package.json

@@ -66,7 +66,7 @@
     "core-js": "^3.2.1",
     "cropper": "^2.3.0",
     "css-loader": "^1.0.0",
-    "d3": "^5.12.0",
+    "d3": "^4.13.0",
     "d3-scale": "^1.0.7",
     "d3-selection": "^1.2.0",
     "dateformat": "^3.0.3",

scripts/rspec_helpers.sh

@@ -40,7 +40,6 @@ function rspec_simple_job() {
   local rspec_opts="${1}"
 
   export NO_KNAPSACK="1"
-  export CACHE_CLASSES="true"
 
   scripts/gitaly-test-spawn
 
@@ -59,7 +58,6 @@ function rspec_paralellized_job() {
     spec_folder_prefix="ee/"
   fi
 
-  export CACHE_CLASSES="true"
   export KNAPSACK_LOG_LEVEL="debug"
   export KNAPSACK_REPORT_PATH="knapsack/${test_tool}_${test_level}_${database}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json"
 

spec/features/merge_request/user_sees_deployment_widget_spec.rb

@@ -96,7 +96,7 @@ describe 'Merge request > User sees deployment widget', :js do
         visit project_merge_request_path(project, merge_request)
         wait_for_requests
 
-        expect(page).to have_content("Canceled deploy to #{environment.name}")
+        expect(page).to have_content("Canceled deployment to #{environment.name}")
         expect(page).not_to have_css('.js-deploy-time')
       end
     end

spec/frontend/vue_mr_widget/deployment/deployment_spec.js

@@ -56,27 +56,27 @@ describe('Deployment component', () => {
     const deployGroup = [DeploymentViewButton, DeploymentStopButton];
 
     describe.each`
-      status      | previous | deploymentDetails | text                        | actionButtons
-      ${CREATED}  | ${true}  | ${deployDetail}   | ${'Can deploy manually to'} | ${deployGroup}
-      ${CREATED}  | ${true}  | ${noDetails}      | ${'Will deploy to'}         | ${deployGroup}
-      ${CREATED}  | ${false} | ${deployDetail}   | ${'Can deploy manually to'} | ${noActions}
-      ${CREATED}  | ${false} | ${noDetails}      | ${'Will deploy to'}         | ${noActions}
-      ${RUNNING}  | ${true}  | ${deployDetail}   | ${'Deploying to'}           | ${deployGroup}
-      ${RUNNING}  | ${true}  | ${noDetails}      | ${'Deploying to'}           | ${deployGroup}
-      ${RUNNING}  | ${false} | ${deployDetail}   | ${'Deploying to'}           | ${noActions}
-      ${RUNNING}  | ${false} | ${noDetails}      | ${'Deploying to'}           | ${noActions}
-      ${SUCCESS}  | ${true}  | ${deployDetail}   | ${'Deployed to'}            | ${deployGroup}
-      ${SUCCESS}  | ${true}  | ${noDetails}      | ${'Deployed to'}            | ${deployGroup}
-      ${SUCCESS}  | ${false} | ${deployDetail}   | ${'Deployed to'}            | ${deployGroup}
-      ${SUCCESS}  | ${false} | ${noDetails}      | ${'Deployed to'}            | ${deployGroup}
-      ${FAILED}   | ${true}  | ${deployDetail}   | ${'Failed to deploy to'}    | ${deployGroup}
-      ${FAILED}   | ${true}  | ${noDetails}      | ${'Failed to deploy to'}    | ${deployGroup}
-      ${FAILED}   | ${false} | ${deployDetail}   | ${'Failed to deploy to'}    | ${noActions}
-      ${FAILED}   | ${false} | ${noDetails}      | ${'Failed to deploy to'}    | ${noActions}
-      ${CANCELED} | ${true}  | ${deployDetail}   | ${'Canceled deploy to'}     | ${deployGroup}
-      ${CANCELED} | ${true}  | ${noDetails}      | ${'Canceled deploy to'}     | ${deployGroup}
-      ${CANCELED} | ${false} | ${deployDetail}   | ${'Canceled deploy to'}     | ${noActions}
-      ${CANCELED} | ${false} | ${noDetails}      | ${'Canceled deploy to'}     | ${noActions}
+      status      | previous | deploymentDetails | text                             | actionButtons
+      ${CREATED}  | ${true}  | ${deployDetail}   | ${'Can be manually deployed to'} | ${deployGroup}
+      ${CREATED}  | ${true}  | ${noDetails}      | ${'Will deploy to'}              | ${deployGroup}
+      ${CREATED}  | ${false} | ${deployDetail}   | ${'Can be manually deployed to'} | ${noActions}
+      ${CREATED}  | ${false} | ${noDetails}      | ${'Will deploy to'}              | ${noActions}
+      ${RUNNING}  | ${true}  | ${deployDetail}   | ${'Deploying to'}                | ${deployGroup}
+      ${RUNNING}  | ${true}  | ${noDetails}      | ${'Deploying to'}                | ${deployGroup}
+      ${RUNNING}  | ${false} | ${deployDetail}   | ${'Deploying to'}                | ${noActions}
+      ${RUNNING}  | ${false} | ${noDetails}      | ${'Deploying to'}                | ${noActions}
+      ${SUCCESS}  | ${true}  | ${deployDetail}   | ${'Deployed to'}                 | ${deployGroup}
+      ${SUCCESS}  | ${true}  | ${noDetails}      | ${'Deployed to'}                 | ${deployGroup}
+      ${SUCCESS}  | ${false} | ${deployDetail}   | ${'Deployed to'}                 | ${deployGroup}
+      ${SUCCESS}  | ${false} | ${noDetails}      | ${'Deployed to'}                 | ${deployGroup}
+      ${FAILED}   | ${true}  | ${deployDetail}   | ${'Failed to deploy to'}         | ${deployGroup}
+      ${FAILED}   | ${true}  | ${noDetails}      | ${'Failed to deploy to'}         | ${deployGroup}
+      ${FAILED}   | ${false} | ${deployDetail}   | ${'Failed to deploy to'}         | ${noActions}
+      ${FAILED}   | ${false} | ${noDetails}      | ${'Failed to deploy to'}         | ${noActions}
+      ${CANCELED} | ${true}  | ${deployDetail}   | ${'Canceled deployment to'}      | ${deployGroup}
+      ${CANCELED} | ${true}  | ${noDetails}      | ${'Canceled deployment to'}      | ${deployGroup}
+      ${CANCELED} | ${false} | ${deployDetail}   | ${'Canceled deployment to'}      | ${noActions}
+      ${CANCELED} | ${false} | ${noDetails}      | ${'Canceled deployment to'}      | ${noActions}
     `(
       '$status + previous: $previous + manual: $deploymentDetails.isManual',
       ({ status, previous, deploymentDetails, text, actionButtons }) => {

spec/lib/gitlab/bitbucket_server_import/importer_spec.rb

@@ -67,6 +67,7 @@ describe Gitlab::BitbucketServerImport::Importer do
         author_email: project.owner.email,
         created_at: Time.now,
         updated_at: Time.now,
+        raw: {},
         merged?: true)
 
       allow(subject.client).to receive(:pull_requests).and_return([pull_request])
@@ -239,6 +240,13 @@ describe Gitlab::BitbucketServerImport::Importer do
       expect(notes.first.note).to start_with('*Comment on .gitmodules')
       expect(notes.second.note).to start_with('*Comment on .gitmodules')
     end
+
+    it 'reports an error if an exception is raised' do
+      allow(subject).to receive(:import_bitbucket_pull_request).and_raise(RuntimeError)
+      expect(Gitlab::ErrorTracking).to receive(:log_exception)
+
+      subject.execute
+    end
   end
 
   describe 'inaccessible branches' do

spec/models/project_services/pipelines_email_service_spec.rb

@@ -305,8 +305,8 @@ describe PipelinesEmailService, :mailer do
     end
 
     context 'with recipients list separating with newlines' do
-      let(:recipients) { "\ntest@gitlab.com,  \r\nexample@gitlab.com" }
-      let(:receivers) { %w[test@gitlab.com example@gitlab.com] }
+      let(:recipients) { "\ntest@gitlab.com,  \r\nexample@gitlab.com\rother@gitlab.com" }
+      let(:receivers) { %w[test@gitlab.com example@gitlab.com other@gitlab.com] }
 
       context 'with failed pipeline' do
         before do

spec/models/project_spec.rb

@@ -3992,7 +3992,7 @@ describe Project do
       end
 
       it 'schedules HashedStorage::ProjectMigrateWorker with delayed start when the project repo is in use' do
-        Gitlab::ReferenceCounter.new(Gitlab::GlRepository::PROJECT.identifier_for_subject(project)).increase
+        Gitlab::ReferenceCounter.new(Gitlab::GlRepository::PROJECT.identifier_for_repositorable(project)).increase
 
         expect(HashedStorage::ProjectMigrateWorker).to receive(:perform_in)
 
@@ -4000,7 +4000,7 @@ describe Project do
       end
 
       it 'schedules HashedStorage::ProjectMigrateWorker with delayed start when the wiki repo is in use' do
-        Gitlab::ReferenceCounter.new(Gitlab::GlRepository::WIKI.identifier_for_subject(project)).increase
+        Gitlab::ReferenceCounter.new(Gitlab::GlRepository::WIKI.identifier_for_repositorable(project)).increase
 
         expect(HashedStorage::ProjectMigrateWorker).to receive(:perform_in)
 

spec/requests/api/internal/base_spec.rb

@@ -268,7 +268,7 @@ describe API::Internal::Base do
       end
 
       context 'with env passed as a JSON' do
-        let(:gl_repository) { Gitlab::GlRepository::WIKI.identifier_for_subject(project) }
+        let(:gl_repository) { Gitlab::GlRepository::WIKI.identifier_for_repositorable(project) }
 
         it 'sets env in RequestStore' do
           obj_dir_relative = './objects'
@@ -1054,9 +1054,9 @@ describe API::Internal::Base do
   def gl_repository_for(project_or_wiki)
     case project_or_wiki
     when ProjectWiki
-      Gitlab::GlRepository::WIKI.identifier_for_subject(project_or_wiki.project)
+      Gitlab::GlRepository::WIKI.identifier_for_repositorable(project_or_wiki.project)
     when Project
-      Gitlab::GlRepository::PROJECT.identifier_for_subject(project_or_wiki)
+      Gitlab::GlRepository::PROJECT.identifier_for_repositorable(project_or_wiki)
     else
       nil
     end

spec/support/shared_examples/repo_type_shared_examples.rb

 # frozen_string_literal: true
 
 shared_examples 'a repo type' do
-  describe "#identifier_for_subject" do
-    subject { described_class.identifier_for_subject(project) }
+  describe "#identifier_for_repositorable" do
+    subject { described_class.identifier_for_repositorable(project) }
 
     it { is_expected.to eq(expected_identifier) }
   end