diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-20 09:22:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-20 09:22:14 +0000 |
| commit | 4f09d099e9fa29659917f87c2dc25f2b9aa05b5e (patch) | |
| tree | a70a9b3d42c8d3762974d354b31aa611590f55b8 /lib/api/helpers | |
| parent | 135437b70d5bf12fff17d10adeae0c459b779138 (diff) | |
| parent | 181cd299f9e06223e8338e93b1c318c671ccb1aa (diff) | |
| download | gitlab-ce-4f09d099e9fa29659917f87c2dc25f2b9aa05b5e.tar.gz | |
Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'
Adds Rubocop rule for line break after guard clause
Closes #18040
See merge request gitlab-org/gitlab-ce!15188
Diffstat (limited to 'lib/api/helpers')
| -rw-r--r-- | lib/api/helpers/custom_validators.rb | 1 | ||||
| -rw-r--r-- | lib/api/helpers/runner.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/helpers/custom_validators.rb b/lib/api/helpers/custom_validators.rb index 0a8f3073a50..dd4f6c41131 100644 --- a/lib/api/helpers/custom_validators.rb +++ b/lib/api/helpers/custom_validators.rb @@ -4,6 +4,7 @@ module API class Absence < Grape::Validations::Base def validate_param!(attr_name, params) return if params.respond_to?(:key?) && !params.key?(attr_name) + raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: message(:absence) end end diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb index 282af32ca94..2cae53dba53 100644 --- a/lib/api/helpers/runner.rb +++ b/lib/api/helpers/runner.rb @@ -14,6 +14,7 @@ module API def get_runner_version_from_params return unless params['info'].present? + attributes_for_keys(%w(name version revision platform architecture), params['info']) end |