diff --git a/Gemfile b/Gemfile index ff3af88..ca0a5a0 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'activeadmin', '0.6.0' gem 'active_model_serializers', '0.8.1' gem 'json', '1.7.7' gem 'meta_search', '1.1.3' -gem 'newrelic_rpm', '3.6.1.88' +gem 'newrelic_rpm', '3.6.2.96' gem 'pg', '0.15.1' gem 'settingslogic', '2.0.9' gem 'unicorn', '4.6.2' diff --git a/Gemfile.lock b/Gemfile.lock index a7a87fa..d842d70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,7 +117,7 @@ GEM polyamorous (~> 0.5.0) mime-types (1.23) multi_json (1.7.3) - newrelic_rpm (3.6.1.88) + newrelic_rpm (3.6.2.96) orm_adapter (0.4.0) pg (0.15.1) polyamorous (0.5.0) @@ -208,7 +208,7 @@ DEPENDENCIES haml-rails (= 0.4.0) json (= 1.7.7) meta_search (= 1.1.3) - newrelic_rpm (= 3.6.1.88) + newrelic_rpm (= 3.6.2.96) pg (= 0.15.1) rails (= 3.2.13) rspec-rails (= 2.13.1) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb deleted file mode 100644 index 61bfd93..0000000 --- a/app/controllers/admin_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class AdminController < ApplicationController - -end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 56e92ff..83f887c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,10 +3,6 @@ devise_for :admin_users, ActiveAdmin::Devise.config ActiveAdmin.routes(self) - namespace :admin do - - end - namespace :api do namespace :v1 do resources :recipes