fix typo, change charset to utf8mb4(MySQL), fix importing

1 files changed, 17 insertions, 16 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index ecc7377..39938f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,5 @@
 GIT
-  remote: git://github.com/re4k/omniauth-twitter.git
+  remote: git://github.com/rhenium/omniauth-twitter.git
   revision: 313df7eb05e78477cf3eb06bced3c9b64957840f
   specs:
     omniauth-twitter (0.0.14)
@@ -36,7 +36,7 @@ GEM
     after_commit_action (0.1.3)
       activerecord (>= 3.0.0)
     arel (4.0.0.beta2)
-    atomic (1.0.2)
+    atomic (1.1.7)
     bootstrap-sass (2.3.1.0)
       sass (~> 3.2)
     builder (3.1.4)
@@ -52,7 +52,7 @@ GEM
     daemon-spawn (0.4.2)
     daemons (1.1.9)
     dalli (2.6.2)
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.3)
     em-work_queue (0.0.1)
       eventmachine
     erubis (2.7.0)
@@ -66,18 +66,19 @@ GEM
       railties (>= 3.0.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)
-    haml (4.0.1)
+    haml (4.0.2)
       tilt
     haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
       haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
-    hashie (1.2.0)
-    hike (1.2.1)
+    hashie (2.0.3)
+    hike (1.2.2)
     i18n (0.6.4)
-    jbuilder (1.2.0)
+    jbuilder (1.3.0)
       activesupport (>= 3.0.0)
+      multi_json (>= 1.2.0)
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -91,14 +92,14 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.22)
-    minitest (4.7.0)
+    minitest (4.7.1)
     msgpack (0.5.4)
     multi_json (1.7.2)
     multipart-post (1.2.0)
-    mysql2 (0.3.11)
+    mysql2 (0.3.12b6)
     oauth (0.4.7)
-    omniauth (1.1.3)
-      hashie (~> 1.2)
+    omniauth (1.1.4)
+      hashie (>= 1.2, < 3)
       rack
     omniauth-oauth (1.0.1)
       oauth
@@ -134,7 +135,7 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.13.1)
     rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -149,7 +150,7 @@ GEM
       sprockets-rails (~> 2.0.0.rc0)
       tilt (~> 1.3)
     simple_oauth (0.2.0)
-    sprockets (2.9.0)
+    sprockets (2.9.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -165,7 +166,7 @@ GEM
     thor (0.18.1)
     thread_safe (0.1.0)
       atomic
-    tilt (1.3.6)
+    tilt (1.3.7)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -174,7 +175,7 @@ GEM
       multi_json (~> 1.0)
       simple_oauth (~> 0.2)
     tzinfo (0.3.37)
-    uglifier (1.3.0)
+    uglifier (2.0.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     unicorn (4.6.2)
@@ -199,7 +200,7 @@ DEPENDENCIES
   jquery-rails
   kaminari
   msgpack
-  mysql2
+  mysql2 (> 0.3.12b)
   omniauth-twitter!
   rails (= 4.0.0.beta1)
   rails_config