diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-15 12:38:28 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-15 12:38:28 +0200 |
| commit | 70ab6624f5f397ddd05136db2fa37c902f0867eb (patch) | |
| tree | 72407fd4b5368d3e8cdfd4c85ae928a654d8d261 /config | |
| parent | 91144d46ecc1a6e2d39abe8bea2d62c5cb57aca3 (diff) | |
| parent | 4d336ceface783c255e62220cfa76812630ff1a1 (diff) | |
Merge branch 'feature-suggestions' into development
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/initializers/neography.rb | 5 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index b1c9d9f6f..3734ce928 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,8 +22,8 @@ module Mastodon # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de - config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') - config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] + # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') + # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] config.active_job.queue_adapter = :sidekiq diff --git a/config/initializers/neography.rb b/config/initializers/neography.rb new file mode 100644 index 000000000..25d54658b --- /dev/null +++ b/config/initializers/neography.rb @@ -0,0 +1,5 @@ +Neography.configure do |config| + config.protocol = "http" + config.server = ENV['NEO4J_HOST'] || 'localhost' + config.port = ENV['NEO4J_PORT'] || 7474 +end diff --git a/config/routes.rb b/config/routes.rb index ec0309dc7..f3708938a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -73,6 +73,7 @@ Rails.application.routes.draw do collection do get :relationships get :verify_credentials + get :suggestions end member do |