Add latest changes from gitlab-org/gitlab@master

7 files changed, 11 insertions, 16 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue
index db4a4ece002..33db9b87b17 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue
+++ b/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() {
diff --git a/app/assets/javascripts/vue_shared/components/bar_chart.vue b/app/assets/javascripts/vue_shared/components/bar_chart.vue
index ff718eacc5b..25d7bfe515c 100644
--- a/app/assets/javascripts/vue_shared/components/bar_chart.vue
+++ b/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
diff --git a/app/helpers/sidekiq_helper.rb b/app/helpers/sidekiq_helper.rb
index 6326d98461e..07d83b8d850 100644
--- a/app/helpers/sidekiq_helper.rb
+++ b/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
diff --git a/app/models/project.rb b/app/models/project.rb
index c48360290c7..a73ca7d5bbb 100644
--- a/app/models/project.rb
+++ b/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
diff --git a/app/models/project_services/pipelines_email_service.rb b/app/models/project_services/pipelines_email_service.rb
index 8452239129d..65bf8535d2a 100644
--- a/app/models/project_services/pipelines_email_service.rb
+++ b/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
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index f4666197def..3bec0c32c2c 100644
--- a/app/models/project_wiki.rb
+++ b/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?
diff --git a/app/models/repository.rb b/app/models/repository.rb
index c53b2fc5340..a509315d94f 100644
--- a/app/models/repository.rb
+++ b/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