diff --git a/Gemfile b/Gemfile index b1333275..ed6a6863 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'uservoice-ruby' gem 'dotenv' gem 'paperclip' -gem 'aws-sdk' +gem 'aws-sdk', '< 2.0' gem 'jquery-rails' gem 'jquery-ui-rails' diff --git a/Gemfile.lock b/Gemfile.lock index f5fa5a3f..b9ba0c6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,12 +37,11 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.3) - aws-sdk (2.1.19) - aws-sdk-resources (= 2.1.19) - aws-sdk-core (2.1.19) - jmespath (~> 1.0) - aws-sdk-resources (2.1.19) - aws-sdk-core (= 2.1.19) + aws-sdk (1.66.0) + aws-sdk-v1 (= 1.66.0) + aws-sdk-v1 (1.66.0) + json (~> 1.4) + nokogiri (>= 1.4.4) bcrypt (3.1.10) best_in_place (3.0.3) actionpack (>= 3.2) @@ -92,8 +91,6 @@ GEM jbuilder (2.3.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jmespath (1.0.2) - multi_json (~> 1.0) jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) @@ -207,7 +204,7 @@ PLATFORMS ruby DEPENDENCIES - aws-sdk + aws-sdk (< 2.0) best_in_place better_errors binding_of_caller @@ -234,3 +231,6 @@ DEPENDENCIES sass-rails uglifier uservoice-ruby + +BUNDLED WITH + 1.10.6 diff --git a/config/routes.rb b/config/routes.rb index e80b837a..a3ab6e3a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,7 +26,7 @@ Metamaps::Application.routes.draw do get 'explore/mapper/:id', to: 'maps#index', as: :usermaps resources :maps, except: [:new, :edit] get 'maps/:id/contains', to: 'maps#contains', as: :contains - get 'maps/:id/upload_screenshot', to: 'maps#screenshot', as: :screenshot + post 'maps/:id/upload_screenshot', to: 'maps#screenshot', as: :screenshot devise_for :users, controllers: { registrations: 'users/registrations', passwords: 'users/passwords', sessions: 'devise/sessions' }, :skip => :sessions