Add latest changes from gitlab-org/gitlab@master

5 files changed, 10 insertions, 6 deletions

diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue
index 137455bcae1..12fe0b8a1ea 100644
--- a/app/assets/javascripts/pipelines/components/graph/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue
@@ -92,6 +92,6 @@ export default {
     @click="onClickAction"
   >
     <gl-loading-icon v-if="isLoading" class="js-action-icon-loading" />
-    <icon v-else :name="actionIcon" />
+    <icon v-else :name="actionIcon" class="gl-mr-0!" />
   </gl-button>
 </template>
diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
index f5bf6a6ed34..ed40dfbfde1 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@@ -131,8 +131,7 @@ export default {
     >
       <div
         :style="{
-          paddingLeft: `${graphLeftPadding}px`,
-          paddingRight: `${graphRightPadding}px`,
+          paddingLeft: `16px`,
         }"
       >
         <gl-loading-icon v-if="isLoading" class="m-auto" size="lg" />
diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml
index 4ae06e1e16f..905b7699579 100644
--- a/app/views/projects/pipelines/_with_tabs.html.haml
+++ b/app/views/projects/pipelines/_with_tabs.html.haml
@@ -26,7 +26,7 @@
     = render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project
 
 .tab-content
-  #js-tab-pipeline.tab-pane.position-absolute.position-left-0.w-100
+  #js-tab-pipeline.tab-pane.w-1000
     #js-pipeline-graph-vue
 
   #js-tab-builds.tab-pane
diff --git a/changelogs/unreleased/pl-perf-backtrace-silencer.yml b/changelogs/unreleased/pl-perf-backtrace-silencer.yml
new file mode 100644
index 00000000000..0968a0b0c38
--- /dev/null
+++ b/changelogs/unreleased/pl-perf-backtrace-silencer.yml
@@ -0,0 +1,5 @@
+---
+title: Improve performance of Rails backtrace cleaner configuration
+merge_request: 40182
+author:
+type: performance
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index f25bb7d25fa..2f892f78112 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -2,7 +2,7 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # This allows us to see the proper caller of SQL calls in {development,test}.log
 if (Rails.env.development? || Rails.env.test?) && Gitlab.ee?
-  Rails.backtrace_cleaner.add_silencer { |line| line =~ %r(^ee/lib/gitlab/database/load_balancing) }
+  Rails.backtrace_cleaner.add_silencer { |line| %r(^ee/lib/gitlab/database/load_balancing).match?(line) }
 end
 
-Rails.backtrace_cleaner.add_silencer { |line| line !~ Gitlab::APP_DIRS_PATTERN }
+Rails.backtrace_cleaner.add_silencer { |line| !Gitlab::APP_DIRS_PATTERN.match?(line) }