diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 03:08:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 03:08:09 +0300 |
commit | 2a65a97e12a0754b9f0d91ee996a6e61e00c80c8 (patch) | |
tree | f439c93cc95a324ba7422b0b650431a628be9b07 /app | |
parent | 2d96e61ceb1a3f26283dfba43f85d99488752296 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue | 1 | ||||
-rw-r--r-- | app/helpers/clusters_helper.rb | 6 | ||||
-rw-r--r-- | app/helpers/todos_helper.rb | 2 | ||||
-rw-r--r-- | app/models/ci/build.rb | 8 | ||||
-rw-r--r-- | app/models/commit_status.rb | 6 |
5 files changed, 18 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue b/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue index 4e7d77863b9..82335e71403 100644 --- a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue +++ b/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue @@ -42,7 +42,6 @@ export default { <template> <li class="linked-pipeline build"> - <div class="curve"></div> <gl-button :id="buttonId" v-gl-tooltip diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 0037c49f134..f55acad8517 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -9,11 +9,11 @@ module ClustersHelper def create_new_cluster_label(provider: nil) case provider when 'aws' - s_('ClusterIntegration|Create new Cluster on EKS') + s_('ClusterIntegration|Create new cluster on EKS') when 'gcp' - s_('ClusterIntegration|Create new Cluster on GKE') + s_('ClusterIntegration|Create new cluster on GKE') else - s_('ClusterIntegration|Create new Cluster') + s_('ClusterIntegration|Create new cluster') end end diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index dce0842060d..0211a22a8c4 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -205,4 +205,4 @@ module TodosHelper end end -TodosHelper.prepend_if_ee('EE::NotesHelper'); TodosHelper.prepend_if_ee('EE::TodosHelper') # rubocop: disable Style/Semicolon +TodosHelper.prepend_if_ee('EE::TodosHelper') diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index ba87369f30b..7e7c580a48e 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -762,6 +762,10 @@ module Ci Gitlab::Ci::Build::Credentials::Factory.new(self).create! end + def all_dependencies + (dependencies + cross_dependencies).uniq + end + def dependencies return [] if empty_dependencies? @@ -782,6 +786,10 @@ module Ci depended_jobs end + def cross_dependencies + [] + end + def empty_dependencies? options[:dependencies]&.empty? end diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 4929c773eb8..8d38835fb3b 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -47,6 +47,12 @@ class CommitStatus < ApplicationRecord scope :after_stage, -> (index) { where('stage_idx > ?', index) } scope :processables, -> { where(type: %w[Ci::Build Ci::Bridge]) } scope :for_ids, -> (ids) { where(id: ids) } + scope :for_ref, -> (ref) { where(ref: ref) } + scope :by_name, -> (name) { where(name: name) } + + scope :for_project_paths, -> (paths) do + where(project: Project.where_full_path_in(Array(paths))) + end scope :with_preloads, -> do preload(:project, :user) |