diff options
author | Robert Speicher <robert@gitlab.com> | 2016-08-09 18:39:03 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-08-09 18:39:03 +0000 |
commit | 04ae276a3a54a6afcf0f8c0a2829acfcb44e9bf7 (patch) | |
tree | 82d4a2e3fc3accd531a02c8d7ba5bda7ca1ea56b /lib | |
parent | 11a60096f6f60a383dc73ffd87384f078f27b0f6 (diff) | |
parent | ec298011f2da1b94232e601c8e857ca180a2274d (diff) | |
download | gitlab-ce-04ae276a3a54a6afcf0f8c0a2829acfcb44e9bf7.tar.gz |
Merge branch 'avoid-constant-warnings-in-rails' into 'master'
Rails prefers require_dependency so that it won't require twice:
## What does this MR do?
Fix warnings for loading constants twice
## Are there points in the code the reviewer needs to double check?
Now it's depending on `require_dependency`.
## Why was this MR needed?
Fixes #20724
Backtrace before this patch: $23876
See merge request !5727
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/email/receiver.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/request_profiler/middleware.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb index 9213cfb51e8..a40c44eb1bc 100644 --- a/lib/gitlab/email/receiver.rb +++ b/lib/gitlab/email/receiver.rb @@ -1,5 +1,5 @@ -require 'gitlab/email/handler' +require_dependency 'gitlab/email/handler' # Inspired in great part by Discourse's Email::Receiver module Gitlab diff --git a/lib/gitlab/request_profiler/middleware.rb b/lib/gitlab/request_profiler/middleware.rb index 4e787dc0656..786e1d49f5e 100644 --- a/lib/gitlab/request_profiler/middleware.rb +++ b/lib/gitlab/request_profiler/middleware.rb @@ -1,5 +1,5 @@ require 'ruby-prof' -require 'gitlab/request_profiler' +require_dependency 'gitlab/request_profiler' module Gitlab module RequestProfiler |