diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
| commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
| tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /app/services/merge_requests/mergeability/run_checks_service.rb | |
| parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'app/services/merge_requests/mergeability/run_checks_service.rb')
| -rw-r--r-- | app/services/merge_requests/mergeability/run_checks_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/merge_requests/mergeability/run_checks_service.rb b/app/services/merge_requests/mergeability/run_checks_service.rb index 7f205c8dd6c..740a6feac2c 100644 --- a/app/services/merge_requests/mergeability/run_checks_service.rb +++ b/app/services/merge_requests/mergeability/run_checks_service.rb @@ -38,7 +38,7 @@ module MergeRequests def failure_reason raise 'Execute needs to be called before' if results.nil? - results.find(&:failed?)&.payload&.fetch(:reason) + results.find(&:failed?)&.payload&.fetch(:reason)&.to_sym end private @@ -46,7 +46,6 @@ module MergeRequests attr_reader :merge_request, :params, :results def run_check(check) - return check.execute unless Feature.enabled?(:mergeability_caching, merge_request.project) return check.execute unless check.cacheable? cached_result = cached_results.read(merge_check: check) |