Commit ffc41b3

Tyler Mercier <tylermercier@gmail.com>
2013-06-11 20:58:03
fix the app for development without AWS cred
main
1 parent b7df510
Changed files (3)
config
initializers
carrierwave.rb
Gemfile
Gemfile.lock
config/initializers/carrierwave.rb
@@ -1,5 +1,5 @@
 CarrierWave.configure do |config|
-  if Rails.env.test?
+  if Rails.env.test? || Rails.env.development?
     config.storage = :file
     config.enable_processing = false
   else
Gemfile
@@ -6,12 +6,16 @@ gem 'jquery-rails'
 gem 'carrierwave'
 gem 'fog'
 gem 'rmagick'
-gem 'sqlite3', :groups => [:development, :test]
 gem 'pg'
 gem 'kaminari'
 gem 'bootstrap-sass'
+gem 'sqlite3', :groups => [:development, :test]
 gem 'dotenv-rails', :groups => [:development, :test]
 
+group :development do
+  gem 'rack-mini-profiler'
+end
+
 group :test do
   gem 'rspec-rails'
   gem 'factory_girl_rails'
Gemfile.lock
@@ -32,7 +32,7 @@ GEM
     asset_sync (0.5.4)
       activemodel
       fog
-    bootstrap-sass (2.3.1.2)
+    bootstrap-sass (2.3.2.0)
       sass (~> 3.2)
     builder (3.0.4)
     carrierwave (0.8.0)
@@ -51,7 +51,7 @@ GEM
     dotenv-rails (0.7.0)
       dotenv (= 0.7.0)
     erubis (2.7.0)
-    excon (0.22.1)
+    excon (0.23.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.2.0)
@@ -59,21 +59,21 @@ GEM
     factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    fog (1.11.1)
+    fog (1.12.1)
       builder
-      excon (~> 0.20)
+      excon (~> 0.23.0)
       formatador (~> 0.2.0)
-      json (~> 1.7)
       mime-types
+      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    hike (1.2.2)
+    hike (1.2.3)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.2.1)
+    jquery-rails (3.0.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
@@ -85,7 +85,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    multi_json (1.7.3)
+    multi_json (1.7.6)
     net-scp (1.1.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.7)
@@ -96,6 +96,8 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-mini-profiler (0.1.26)
+      rack (>= 1.1.3)
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
@@ -145,7 +147,7 @@ GEM
     sqlite3 (1.3.7)
     thor (0.18.1)
     tilt (1.4.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
@@ -173,6 +175,7 @@ DEPENDENCIES
   kaminari
   newrelic_rpm
   pg
+  rack-mini-profiler
   rails (= 3.2.13)
   rmagick
   rspec-rails