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
This commit is contained in:
Robert Speicher 2016-08-09 18:39:03 +00:00
commit 04ae276a3a
2 changed files with 2 additions and 2 deletions

View file

@ -1,5 +1,5 @@
require 'gitlab/email/handler'
require_dependency 'gitlab/email/handler'
# Inspired in great part by Discourse's Email::Receiver
module Gitlab

View file

@ -1,5 +1,5 @@
require 'ruby-prof'
require 'gitlab/request_profiler'
require_dependency 'gitlab/request_profiler'
module Gitlab
module RequestProfiler