heroku deploy

Gemfile

@@ -42,6 +42,6 @@ end
 gem 'devise'
 gem 'cancan'
 gem 'bootstrap-sass'
-gem 'mysql'
+#gem 'mysql'
 
 

Gemfile.lock

@@ -25,34 +25,34 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.1)
+    arel (4.0.2)
-    atomic (1.1.14)
+    bcrypt (3.1.9)
-    bcrypt-ruby (3.1.2)
+    bootstrap-sass (3.3.1.0)
-    bootstrap-sass (2.3.2.0)
       sass (~> 3.2)
     builder (3.1.4)
     cancan (1.6.10)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.8.0)
-    devise (3.2.2)
+    devise (3.4.1)
-      bcrypt-ruby (~> 3.0)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.2.2)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.7.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -61,10 +61,10 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.10.1)
     orm_adapter (0.5.0)
     pg (0.15.1)
-    polyglot (0.3.3)
+    polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -81,18 +81,21 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.4.2)
-    rdoc (3.12.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    sass (3.2.13)
+    responders (1.1.2)
-    sass-rails (4.0.1)
+      railties (>= 3.2, < 4.2)
+    sass (3.2.19)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
+      sass (~> 3.2.2)
-      sprockets-rails (~> 2.0.0)
+      sprockets (~> 2.8, < 3.0)
-    sdoc (0.3.20)
+      sprockets-rails (~> 2.0)
-      json (>= 1.1.3)
+    sdoc (0.4.1)
-      rdoc (~> 3.10)
+      json (~> 1.7, >= 1.7.7)
-    sprockets (2.10.1)
+      rdoc (~> 4.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -101,18 +104,17 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.10)
-    thor (0.18.1)
+    thor (0.19.1)
-    thread_safe (0.1.3)
+    thread_safe (0.3.4)
-      atomic
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.1.0)
+    turbolinks (2.5.3)
       coffee-rails
-    tzinfo (0.3.38)
+    tzinfo (0.3.42)
-    uglifier (2.4.0)
+    uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     warden (1.2.3)