Add latest changes from gitlab-org/gitlab@master

5 files changed, 26 insertions, 0 deletions

diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index c4a0ed63080..56a88ca44db 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -68,3 +68,4 @@
 @import 'framework/flex_grid';
 @import 'framework/system_messages';
 @import "framework/spinner";
+@import 'framework/card';
diff --git a/app/assets/stylesheets/framework/card.scss b/app/assets/stylesheets/framework/card.scss
new file mode 100644
index 00000000000..1e51d28bba2
--- /dev/null
+++ b/app/assets/stylesheets/framework/card.scss
@@ -0,0 +1,9 @@
+.card-header {
+  &:first-child {
+    // intended use case: card with only a header (for example empty related issues)
+    &.border-0,
+    &.border-bottom-0 {
+      @include border-radius($card-inner-border-radius);
+    }
+  }
+}
diff --git a/app/models/internal_id.rb b/app/models/internal_id.rb
index 237401899db..946a3aafe18 100644
--- a/app/models/internal_id.rb
+++ b/app/models/internal_id.rb
@@ -16,6 +16,8 @@
 # * Add `usage` value to enum
 # * (Optionally) add columns to `internal_ids` if needed for scope.
 class InternalId < ApplicationRecord
+  include Gitlab::Utils::StrongMemoize
+
   belongs_to :project
   belongs_to :namespace
 
@@ -47,10 +49,18 @@ class InternalId < ApplicationRecord
   def update_and_save(&block)
     lock!
     yield
+    update_and_save_counter.increment(usage: usage, changed: last_value_changed?)
     save!
     last_value
   end
 
+  # Temporary instrumentation to track for-update locks
+  def update_and_save_counter
+    strong_memoize(:update_and_save_counter) do
+      Gitlab::Metrics.counter(:gitlab_internal_id_for_update_lock, 'Number of ROW SHARE (FOR UPDATE) locks on individual records from internal_ids')
+    end
+  end
+
   class << self
     def track_greatest(subject, scope, usage, new_value, init)
       return new_value unless available?
diff --git a/changelogs/unreleased/winh-related-issues-border.yml b/changelogs/unreleased/winh-related-issues-border.yml
new file mode 100644
index 00000000000..2a8beecdefe
--- /dev/null
+++ b/changelogs/unreleased/winh-related-issues-border.yml
@@ -0,0 +1,5 @@
+---
+title: Redo fix for related issues border radius
+merge_request: 17172
+author:
+type: fixed
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 1a5fdac1c95..4d6269f0e01 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -71,6 +71,7 @@ describe Ci::CreatePipelineService do
         expect(Gitlab::Metrics).to receive(:counter)
           .with(:pipelines_created_total, "Counter of pipelines created")
           .and_call_original
+        allow(Gitlab::Metrics).to receive(:counter).and_call_original # allow other counters
 
         pipeline
       end