kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-08-22 03:10:32 +00:00
parent 18a3cea2ea
commit a3fee4760c
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/pipelines/components/graph/action_component.vue
View File

@ -92,6 +92,6 @@ export default {
@click="onClickAction" @click="onClickAction"
> >
<gl-loading-icon v-if="isLoading" class="js-action-icon-loading" /> <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> </gl-button>
</template> </template>

3
app/assets/javascripts/pipelines/components/graph/graph_component.vue
View File

@ -131,8 +131,7 @@ export default {
> >
<div <div
:style="{ :style="{
paddingLeft: `${graphLeftPadding}px`, paddingLeft: `16px`,
paddingRight: `${graphRightPadding}px`,
}" }"
> >
<gl-loading-icon v-if="isLoading" class="m-auto" size="lg" /> <gl-loading-icon v-if="isLoading" class="m-auto" size="lg" />

2
app/views/projects/pipelines/_with_tabs.html.haml
View File

@ -26,7 +26,7 @@
= render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project = render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project
.tab-content .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-pipeline-graph-vue
#js-tab-builds.tab-pane #js-tab-builds.tab-pane

5
changelogs/unreleased/pl-perf-backtrace-silencer.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Improve performance of Rails backtrace cleaner configuration
merge_request: 40182
author:
type: performance

4
config/initializers/backtrace_silencers.rb
View File

@ -2,7 +2,7 @@ Rails.backtrace_cleaner.remove_silencers!
# This allows us to see the proper caller of SQL calls in {development,test}.log # This allows us to see the proper caller of SQL calls in {development,test}.log
if (Rails.env.development? || Rails.env.test?) && Gitlab.ee? 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 end
Rails.backtrace_cleaner.add_silencer { |line| line !~ Gitlab::APP_DIRS_PATTERN } Rails.backtrace_cleaner.add_silencer { |line| !Gitlab::APP_DIRS_PATTERN.match?(line) }