diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-03 18:13:13 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-04 00:09:48 -0300 |
| commit | 1f54c9216f178e96010b28a74f04bae5848ef15d (patch) | |
| tree | 7f5b63c6db133916be3cb20d94d30c0c64dc60d3 /app/models/merge_request.rb | |
| parent | ccfe6860079c6c75ab5a1f831cd62af0e355331e (diff) | |
| download | gitlab-ce-1f54c9216f178e96010b28a74f04bae5848ef15d.tar.gz | |
Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvements
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8d9a30397a9..4a575dc7ba8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -734,10 +734,9 @@ class MergeRequest < ActiveRecord::Base end def has_ci? - has_ci_integration = source_project.try(:ci_service) - uses_gitlab_ci = all_pipelines.any? + return false if has_no_commits? - (has_ci_integration || uses_gitlab_ci) && commits.any? + !!(head_pipeline_id || all_pipelines.any? || source_project&.ci_service) end def branch_missing? |