diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-31 18:02:19 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-31 18:02:19 +0200 |
| commit | 92edb3edab89dcb7b87bad3ac0fe7fed404fea85 (patch) | |
| tree | b96e7b9d37a789ad252ee5c01a6c2811b9bc88d5 /app/controllers/concerns | |
| parent | 7c215dd23dfa942d6b83252403ce326df96ab3ea (diff) | |
| parent | 9aef0427eb9986fc27a399ea6b47e1518d6ebdac (diff) | |
| download | gitlab-ce-92edb3edab89dcb7b87bad3ac0fe7fed404fea85.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/models/issue.rb
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/requires_whitelisted_monitoring_client.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb index ad2f4bbc486..0218ac83441 100644 --- a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb +++ b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb @@ -1,5 +1,8 @@ module RequiresWhitelistedMonitoringClient extend ActiveSupport::Concern + + include Gitlab::CurrentSettings + included do before_action :validate_ip_whitelisted_or_valid_token! end |