summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-04-15 19:23:33 +0530
committerKamil Trzcinski <ayufan@ayufan.eu>2016-04-29 16:50:07 +0200
commit0a280158efeb7f681589ae7af24f0ed9052de809 (patch)
tree7599b5eaba9acaed3219dd078e47b10dbe95cc04 /config
parent5fc310b440a7bb3ead91760ac2b7cbb1cee72f2a (diff)
downloadgitlab-ce-0a280158efeb7f681589ae7af24f0ed9052de809.tar.gz
Eager load `lib/api`
- So that the server doesn't have to be restarted for every change in dev.
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
-rw-r--r--config/routes.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb
index 2e2ed48db07..abe22691ad1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -79,6 +79,8 @@ 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 5ce1f49ec6a..adf4bb18b3c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,5 @@
require 'sidekiq/web'
require 'sidekiq/cron/web'
-require 'api/api'
Rails.application.routes.draw do
if Gitlab::Sherlock.enabled?