diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:26:14 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:26:14 +0300 |
| commit | 51a8811e262c48e2d3aaa426b3c87693dda87b37 (patch) | |
| tree | 1e550a226a1f0674511659d1a034c45133c0374a /config | |
| parent | 71da2e0b56a89fc87f2da3685bdebb333690593a (diff) | |
Revert "Eager load `lib/api`"
This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index d4b86bb38bb..b602e2b6168 100644 --- a/config/application.rb +++ b/config/application.rb @@ -102,8 +102,6 @@ module Gitlab # This is needed for gitlab-shell ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH'] - config.eager_load_paths += ["#{Rails.root}/lib"] - config.generators do |g| g.factory_girl false end diff --git a/config/routes.rb b/config/routes.rb index bfc6818a8d8..3c855cfafd0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ require 'sidekiq/web' require 'sidekiq/cron/web' +require 'api/api' Rails.application.routes.draw do if Gitlab::Sherlock.enabled? |