From 8c9dc985b90c353b33cb829caf51f8320171bc15 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 12 Feb 2020 06:09:05 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/diff_line_gutter_content.vue | 5 +- .../javascripts/lib/utils/common_utils.js | 5 +- app/models/ci/bridge.rb | 1 - app/models/ci/build.rb | 1 - app/models/ci/processable.rb | 19 ++ .../clusters/applications/elastic_stack.rb | 15 +- app/services/ci/retry_build_service.rb | 9 +- .../shared/boards/components/_board.html.haml | 2 +- .../24020-copy-markdown-from-comments.yml | 5 + ...235-support-allow-failure-for-ci-rules.yml | 5 + .../unreleased/ak-wait-for-green-es.yml | 5 + .../unreleased/jdb-minimal-merge-ref-diff.yml | 5 + .../ss-fix-text-truncated-on-board-list.yml | 5 + db/fixtures/development/14_pipelines.rb | 5 +- ...124940_add_scheduling_type_to_ci_builds.rb | 11 + db/schema.rb | 1 + doc/ci/yaml/README.md | 22 +- doc/user/clusters/applications.md | 4 +- doc/user/group/index.md | 3 +- lib/gitlab/ci/build/rules.rb | 8 +- lib/gitlab/ci/config/entry/bridge.rb | 3 +- lib/gitlab/ci/config/entry/job.rb | 3 +- lib/gitlab/ci/config/entry/rules/rule.rb | 5 +- lib/gitlab/ci/yaml_processor.rb | 1 + spec/factories/ci/bridge.rb | 1 + spec/factories/ci/builds.rb | 1 + .../diff_line_gutter_content_spec.js | 230 ++++++++++++------ .../shortcuts/shortcuts_issuable_spec.js | 14 ++ spec/lib/gitlab/ci/build/rules_spec.rb | 50 +++- .../lib/gitlab/ci/config/entry/bridge_spec.rb | 6 +- spec/lib/gitlab/ci/config/entry/job_spec.rb | 7 +- spec/lib/gitlab/ci/config/entry/jobs_spec.rb | 6 +- spec/lib/gitlab/ci/config/entry/root_spec.rb | 15 +- .../gitlab/ci/config/entry/rules/rule_spec.rb | 45 +++- .../lib/gitlab/ci/pipeline/seed/build_spec.rb | 6 +- .../lib/gitlab/ci/pipeline/seed/stage_spec.rb | 6 +- spec/lib/gitlab/ci/yaml_processor_spec.rb | 53 ++-- .../import_export/safe_model_attributes.yml | 1 + spec/models/ci/build_spec.rb | 3 +- spec/models/ci/processable_spec.rb | 68 ++++++ .../ci/create_pipeline_service/needs_spec.rb | 4 + .../ci/create_pipeline_service_spec.rb | 202 ++++++++++++++- spec/services/ci/retry_build_service_spec.rb | 22 ++ vendor/elastic_stack/values.yaml | 2 +- .../elastic_stack/wait-for-elasticsearch.sh | 23 ++ 45 files changed, 774 insertions(+), 139 deletions(-) create mode 100644 changelogs/unreleased/24020-copy-markdown-from-comments.yml create mode 100644 changelogs/unreleased/30235-support-allow-failure-for-ci-rules.yml create mode 100644 changelogs/unreleased/ak-wait-for-green-es.yml create mode 100644 changelogs/unreleased/jdb-minimal-merge-ref-diff.yml create mode 100644 changelogs/unreleased/ss-fix-text-truncated-on-board-list.yml create mode 100644 db/migrate/20191223124940_add_scheduling_type_to_ci_builds.rb create mode 100755 vendor/elastic_stack/wait-for-elasticsearch.sh diff --git a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue index 34aa15856d2..9eaceb8893c 100644 --- a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue +++ b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue @@ -1,5 +1,6 @@