diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 10:06:07 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 10:06:07 +0100 |
| commit | 0e96d6eb10f92f14d9c06e1728b1a3597a856d2a (patch) | |
| tree | e003ee5ba773743fb856f9899b2a2c311139f048 /config/environment.rb | |
| parent | 46278ec7ba7c618acaf7381ad466742ce84e33db (diff) | |
| parent | 234f4bf20fb338f2164976fd39203fbc671afd29 (diff) | |
| download | gitlab-ce-0e96d6eb10f92f14d9c06e1728b1a3597a856d2a.tar.gz | |
Merge branch 'master' into merge-if-green
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environment.rb b/config/environment.rb index 3b186a9d57a..df3006d349c 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,4 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the rails application -Gitlab::Application.initialize! +Rails.application.initialize! |