diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-11-16 01:38:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 01:38:26 -0600 |
| commit | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (patch) | |
| tree | fcd9bdb5ba49ab7a6a79590c74db858ae77b4239 /app/controllers/admin/settings_controller.rb | |
| parent | 88627fd7aa2493a6890d60a5965459e4c7fe6fe9 (diff) | |
| parent | 35fbdc36f92b610e8a73e2acb220e87cf5fc83b0 (diff) | |
Merge pull request #216 from glitch-soc/merge-upstream-3023725
Merge upstream at commit 3023725
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index a2f86b8a9..e81290228 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -28,10 +28,13 @@ module Admin ).freeze def edit + authorize :settings, :show? @admin_settings = Form::AdminSettings.new end def update + authorize :settings, :update? + settings_params.each do |key, value| if UPLOAD_SETTINGS.include?(key) upload = SiteUpload.where(var: key).first_or_initialize(var: key) |