glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

getting uploads working

Browse source 
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
This commit is contained in:
Connor Turland 2015-11-04 17:52:58 -05:00
parent 67d4a2aa34
commit dcbe24bb7e
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -17,7 +17,7 @@ gem 'uservoice-ruby'
gem 'dotenv' gem 'dotenv'
gem 'paperclip' gem 'paperclip'
gem 'aws-sdk' gem 'aws-sdk', '< 2.0'
gem 'jquery-rails' gem 'jquery-rails'
gem 'jquery-ui-rails' gem 'jquery-ui-rails'

18
Gemfile.lock
View file

@ -37,12 +37,11 @@ GEM
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (6.0.3) arel (6.0.3)
aws-sdk (2.1.19) aws-sdk (1.66.0)
aws-sdk-resources (= 2.1.19) aws-sdk-v1 (= 1.66.0)
aws-sdk-core (2.1.19) aws-sdk-v1 (1.66.0)
jmespath (~> 1.0) json (~> 1.4)
aws-sdk-resources (2.1.19) nokogiri (>= 1.4.4)
aws-sdk-core (= 2.1.19)
bcrypt (3.1.10) bcrypt (3.1.10)
best_in_place (3.0.3) best_in_place (3.0.3)
actionpack (>= 3.2) actionpack (>= 3.2)
@ -92,8 +91,6 @@ GEM
jbuilder (2.3.1) jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
jmespath (1.0.2)
multi_json (~> 1.0)
jquery-rails (4.0.5) jquery-rails (4.0.5)
rails-dom-testing (~> 1.0) rails-dom-testing (~> 1.0)
railties (>= 4.2.0) railties (>= 4.2.0)
@ -207,7 +204,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
aws-sdk aws-sdk (< 2.0)
best_in_place best_in_place
better_errors better_errors
binding_of_caller binding_of_caller
@ -234,3 +231,6 @@ DEPENDENCIES
sass-rails sass-rails
uglifier uglifier
uservoice-ruby uservoice-ruby
BUNDLED WITH
1.10.6

2
config/routes.rb
View file

@ -26,7 +26,7 @@ Metamaps::Application.routes.draw do
get 'explore/mapper/:id', to: 'maps#index', as: :usermaps get 'explore/mapper/:id', to: 'maps#index', as: :usermaps
resources :maps, except: [:new, :edit] resources :maps, except: [:new, :edit]
get 'maps/:id/contains', to: 'maps#contains', as: :contains 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 devise_for :users, controllers: { registrations: 'users/registrations', passwords: 'users/passwords', sessions: 'devise/sessions' }, :skip => :sessions