diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
| commit | cbdff06aa95a7987b54c712dc6729e138f608eca (patch) | |
| tree | b101dd575c5cab97675c0ac488e68fa6cbd0c4fd /app/controllers/api_controller.rb | |
| parent | f02881b5bf5cc4d633983100078be2e64b8e6fcc (diff) | |
Rename Configuration class to avoid conflict with ActiveSupport::Configurable
Diffstat (limited to 'app/controllers/api_controller.rb')
| -rw-r--r-- | app/controllers/api_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 57eca965e..f039390b3 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -243,6 +243,6 @@ class ApiController < ApplicationController private def make_url(*args) - "http://" + Configuration::domain + "/" + args.join("/") + "http://" + AlaveteliConfiguration::domain + "/" + args.join("/") end end |