diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-01-17 21:01:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-01-17 21:01:06 +0000 |
| commit | 195448c28c3a3238126e9e21f7b1abb8f186980e (patch) | |
| tree | 0d2d760317e17aeb3a7dc0d74ffc5d1978a00cb0 /lib/api/v3/entities.rb | |
| parent | 525b178e5d5cfe127fe2cfc6f211725e6c3089ae (diff) | |
| parent | f351cc28c2c878bf491bb0886be65bf35b58b261 (diff) | |
| download | gitlab-ce-dispatcher-project-mr-edit.tar.gz | |
Merge branch 'master' into 'dispatcher-project-mr-edit'dispatcher-project-mr-edit
# Conflicts:
# app/assets/javascripts/dispatcher.js
Diffstat (limited to 'lib/api/v3/entities.rb')
| -rw-r--r-- | lib/api/v3/entities.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/api/v3/entities.rb b/lib/api/v3/entities.rb index 64758dae7d3..2ccbb9da1c5 100644 --- a/lib/api/v3/entities.rb +++ b/lib/api/v3/entities.rb @@ -257,10 +257,7 @@ module API expose :job_events, as: :build_events # Expose serialized properties expose :properties do |service, options| - field_names = service.fields - .select { |field| options[:include_passwords] || field[:type] != 'password' } - .map { |field| field[:name] } - service.properties.slice(*field_names) + service.properties.slice(*service.api_field_names) end end |