From c6b3ec3f56fa32a0e0ed3de0d0878d25f1adaddf Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Apr 2020 15:09:30 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/serializers/merge_request_widget_entity.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/serializers') diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb index 7ba15dd9acf..74f29b36209 100644 --- a/app/serializers/merge_request_widget_entity.rb +++ b/app/serializers/merge_request_widget_entity.rb @@ -96,7 +96,7 @@ class MergeRequestWidgetEntity < Grape::Entity def can_add_ci_config_path?(merge_request) merge_request.source_project&.uses_default_ci_config? && - merge_request.all_pipelines.none? && + !merge_request.source_project.has_ci? && merge_request.commits_count.positive? && can?(current_user, :read_build, merge_request.source_project) && can?(current_user, :create_pipeline, merge_request.source_project) -- cgit v1.2.3