From e532d63257d0b60481459e838de587c5c8f8d6aa Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Thu, 11 Sep 2014 23:07:35 +0600 Subject: [PATCH] downgrade ohm to 1.3.2 --- Gemfile | 2 +- Gemfile.lock | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index f4e274ecc..913057928 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem 'friendly_id', '~> 5.0' gem 'rack-throttle', '~> 0.3.0' gem 'rest-client', '~> 1.7' -gem 'ohm', '~> 2.0' +gem 'ohm', '~> 1.3.2' # Ohm 2 breaks the compatibility with previous versions. gem 'ohm-expire', '~> 0.1.3' gem 'ffi', '~> 1.9.3' diff --git a/Gemfile.lock b/Gemfile.lock index ffbc2efcb..b22d366a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,6 @@ GEM highline (1.6.21) hike (1.2.3) hirb (0.7.2) - hiredis (0.5.2) i18n (0.6.11) inherited_resources (1.4.1) has_scope (~> 0.6.0.rc) @@ -256,10 +255,11 @@ GEM momentjs-rails (2.8.1) railties (>= 3.1) mono_logger (1.1.0) - msgpack (0.5.8) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) + nest (1.1.2) + redis net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -270,7 +270,6 @@ GEM netrc (0.7.7) newrelic_rpm (3.9.3.241) ng-rails-csrf (0.1.0) - nido (0.0.1) nokogiri (1.6.3.1) mini_portile (= 0.6.0) oauth2 (1.0.0) @@ -279,10 +278,10 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (~> 1.2) - ohm (2.0.1) - msgpack - nido - redic + ohm (1.3.2) + nest (~> 1.0) + redis + scrivener (~> 0.0.3) ohm-expire (0.1.3.2) ohm (>= 0.1.5) omniauth (1.2.2) @@ -354,8 +353,6 @@ GEM polyamorous (~> 1.1) rdiscount (2.1.7.1) redcarpet (3.1.2) - redic (1.1.1) - hiredis redis (3.0.7) redis-actionpack (4.0.0) actionpack (~> 4) @@ -433,6 +430,7 @@ GEM schema_plus (1.5.3) activerecord (>= 3.2) valuable + scrivener (0.0.3) shotgun (0.9) rack (>= 1.0) shoulda (3.5.0) @@ -559,7 +557,7 @@ DEPENDENCIES momentjs-rails newrelic_rpm ng-rails-csrf - ohm (~> 2.0) + ohm (~> 1.3.2) ohm-expire (~> 0.1.3) omniauth omniauth-facebook