diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 18:06:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 18:06:41 +0300 |
| commit | cd631619f465a0eee2fe714e720f6b6312dd3e56 (patch) | |
| tree | fdc5eb698c2e51fc38dda5a63a0b3f74abc143c3 /app | |
| parent | f03a645e7409882fe8b1aceca1735bc9051c612a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/job_log.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 7 | ||||
| -rw-r--r-- | app/models/ci/build.rb | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/job_log.scss b/app/assets/stylesheets/framework/job_log.scss index b93b224ae13..ba163aa46ae 100644 --- a/app/assets/stylesheets/framework/job_log.scss +++ b/app/assets/stylesheets/framework/job_log.scss @@ -12,7 +12,7 @@ } .log-line { - padding: 1px $gl-padding 1px $job-log-line-padding; + padding: 1px $gl-padding-8 1px $job-log-line-padding; min-height: $gl-line-height-20; } @@ -20,7 +20,7 @@ color: $gl-text-color-inverted; padding: 0 $gl-padding-8; min-width: $job-line-number-width; - margin-left: -$job-line-number-width; + margin-left: -$job-line-number-margin; padding-right: 1em; &:hover, diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index e77527ac130..f352ee33535 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -606,9 +606,10 @@ $blame-blue: #254e77; */ $builds-trace-bg: #111; $job-log-highlight-height: 18px; -$job-log-line-padding: 62px; -$job-line-number-width: 40px; -$job-arrow-margin: 50px; +$job-log-line-padding: 55px; +$job-line-number-width: 50px; +$job-line-number-margin: 43px; +$job-arrow-margin: 55px; /* * Commit Page diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5cca18024c1..fba14f0100c 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -128,6 +128,12 @@ module Ci scope :with_stale_live_trace, -> { with_live_trace.finished_before(12.hours.ago) } scope :finished_before, -> (date) { finished.where('finished_at < ?', date) } + scope :with_secure_reports_from_options, -> (job_type) { where('options like :job_type', job_type: "%:artifacts:%:reports:%:#{job_type}:%") } + + scope :with_secure_reports_from_config_options, -> (job_types) do + joins(:metadata).where("ci_builds_metadata.config_options -> 'artifacts' -> 'reports' ?| array[:job_types]", job_types: job_types) + end + scope :matches_tag_ids, -> (tag_ids) do matcher = ::ActsAsTaggableOn::Tagging .where(taggable_type: CommitStatus.name) |