diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-23 12:14:14 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-23 12:14:14 +0300 |
| commit | f4bc6ec92e2af0b6cfd64f9ff0ca683bf62820d1 (patch) | |
| tree | 9e34a9a071d0c0c5900c0ba37927de4590fa23f9 /lib/api/settings.rb | |
| parent | 0a8aebcb550b705ec5987c6f905eaf5c5abb1cc1 (diff) | |
| parent | 08266ba0a14ec296b51cda6b54d1648985a11adf (diff) | |
Merge branch 'bvl-external-auth-port' into 'master'
Port `read_cross_project` ability from EE
See merge request gitlab-org/gitlab-ce!17208
Diffstat (limited to 'lib/api/settings.rb')
| -rw-r--r-- | lib/api/settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index cee4d309816..152df23a327 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -147,7 +147,7 @@ module API attrs[:password_authentication_enabled_for_web] = attrs.delete(:password_authentication_enabled) end - if current_settings.update_attributes(attrs) + if ApplicationSettings::UpdateService.new(current_settings, current_user, attrs).execute present current_settings, with: Entities::ApplicationSetting else render_validation_error!(current_settings) |