diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-20 03:10:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-20 03:10:39 +0300 |
| commit | 811600560e2a93a0777003bafe1860efb1f94603 (patch) | |
| tree | 7f1639868e72291a82d08ecb41430a00ac9dc269 /app | |
| parent | f265a70317c69af9d955d9a4c303b0bbcb8261ee (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue | 1 | ||||
| -rw-r--r-- | app/models/ci/build.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue index bec4ab407f0..369eeb5ce6d 100644 --- a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue +++ b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue @@ -118,6 +118,7 @@ export default { }, yAxis: { name: s__('Pipeline|Pipelines'), + minInterval: 1, }, }, get chartTitles() { diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5e3f42d7c2c..11c4f5fafc5 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -1122,7 +1122,6 @@ module Ci end def conditionally_allow_failure!(exit_code) - return unless ::Gitlab::Ci::Features.allow_failure_with_exit_codes_enabled? return unless exit_code if allowed_to_fail_with_code?(exit_code) |