diff --git a/Gemfile.lock b/Gemfile.lock index f043524e7..2716c35b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,6 +89,7 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) + configurate (0.0.1) crack (0.3.1) cucumber (1.2.1) builder (>= 2.1.2) @@ -224,6 +225,7 @@ GEM rails multi_json (1.4.0) multipart-post (1.1.5) + mysql2 (0.3.11) nested_form (0.2.3) net-scp (1.0.4) net-ssh (>= 1.99.1) @@ -258,7 +260,6 @@ GEM multi_json (~> 1.3) omniauth-oauth (~> 1.0) orm_adapter (0.4.0) - pg (0.14.1) polyglot (0.3.3) pry (0.9.10) coderay (~> 1.0.5) @@ -452,12 +453,12 @@ DEPENDENCIES messagebus_ruby_api (= 1.0.3) mini_magick (= 3.4) mobile-fu (= 1.1.0) + mysql2 (= 0.3.11) nokogiri (= 1.5.5) omniauth (= 1.1.1) omniauth-facebook (= 1.4.1) omniauth-tumblr (= 1.1) omniauth-twitter (= 0.0.13) - pg (= 0.14.1) rack-cors (= 0.2.7) rack-google-analytics (= 0.11.0) rack-piwik (= 0.1.3)