diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-09 06:48:23 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-09 06:48:23 +0000 |
| commit | ec298011f2da1b94232e601c8e857ca180a2274d (patch) | |
| tree | 7fe9e68c2835310fdccde20ebc16b78e93ea2cda | |
| parent | af9127e0491a284fae82d347ae311b0710e63fff (diff) | |
| download | gitlab-ce-avoid-constant-warnings-in-rails.tar.gz | |
Rails prefers require_dependency so that it won't require twice:avoid-constant-warnings-in-rails
Closes #20724
| -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 |