diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 18:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 18:09:30 +0300 |
| commit | c6b3ec3f56fa32a0e0ed3de0d0878d25f1adaddf (patch) | |
| tree | 967afee9a510ff9dd503ebd83706dc760ec2e3ed /app/serializers | |
| parent | 903ccf7c93eb9490c76857bffe744249cc07de09 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_widget_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |