diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-01-13 21:46:38 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-01-13 21:46:38 +0300 |
| commit | 33ea09bdf9c05c60438f03ac1fe94b52615cd05e (patch) | |
| tree | 93e4f76b5f03f6c5d24c0ee5aef849acc9bfa253 /app/controllers | |
| parent | 0c10aee59677e2dadfef6538a74fe1e28fcdd37e (diff) | |
| parent | 1202355703b9357e85fffa308a25c86576f7bfa0 (diff) | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/private-references
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/abuse_reports_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/admin/abuse_reports_controller.rb b/app/controllers/admin/abuse_reports_controller.rb index 38a5a9fca08..2463cfa87be 100644 --- a/app/controllers/admin/abuse_reports_controller.rb +++ b/app/controllers/admin/abuse_reports_controller.rb @@ -6,11 +6,9 @@ class Admin::AbuseReportsController < Admin::ApplicationController def destroy abuse_report = AbuseReport.find(params[:id]) - if params[:remove_user] - abuse_report.user.destroy - end - + abuse_report.remove_user if params[:remove_user] abuse_report.destroy + render nothing: true end end diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 44d06b6a647..91f7d78bd73 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -73,6 +73,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :metrics_pool_size, :metrics_timeout, :metrics_method_call_threshold, + :metrics_sample_interval, :recaptcha_enabled, :recaptcha_site_key, :recaptcha_private_key, |