diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-14 01:38:27 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-03-16 15:57:21 +0300 |
| commit | 254529300eeb0a11e50e0b2ebc1abecf9908f13e (patch) | |
| tree | 1b2b7a71b41f57af1413ec2dba472fd5ecf5d0b3 /rubocop/rubocop.rb | |
| parent | c7e4919eaaf385d283fdb8bbb737d898326f7304 (diff) | |
Merge branch 'fj-15329-services-callbacks-ssrf-10-5' into 'security-10-5'
[10.5] Server Side Request Forgery in Services and Web Hooks
See merge request gitlab/gitlabhq!2348
Diffstat (limited to 'rubocop/rubocop.rb')
| -rw-r--r-- | rubocop/rubocop.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index 9110237c538..530fe3409fb 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -1,5 +1,6 @@ require_relative 'cop/gitlab/module_with_instance_variables' require_relative 'cop/gitlab/predicate_memoization' +require_relative 'cop/gitlab/httparty' require_relative 'cop/include_sidekiq_worker' require_relative 'cop/line_break_around_conditional_block' require_relative 'cop/migration/add_column' |