diff --git a/Gemfile b/Gemfile index d278d37..b785f48 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "sinatra", '~> 1.4' gem "sinatra-contrib" -gem "activesupport", '~> 3.2' +gem "activesupport", '~> 4.2' gem "riak-client", :github => "5apps/riak-ruby-client", :branch => "invalid_uri_error" gem "fog" gem "rest-client" diff --git a/Gemfile.lock b/Gemfile.lock index 196feac..49fafe1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,9 +13,12 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (3.2.18) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) + activesupport (4.2.1) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) backports (3.6.4) beefcake (0.3.7) builder (3.2.2) @@ -39,6 +42,7 @@ GEM domain_name (~> 0.5) i18n (0.7.0) innertube (1.0.2) + json (1.8.2) kgio (2.9.3) m (1.3.4) method_source (>= 0.6.7) @@ -85,7 +89,10 @@ GEM rack-test sinatra (~> 1.4.0) tilt (~> 1.3) + thread_safe (0.3.5) tilt (1.4.1) + tzinfo (1.2.2) + thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.7.1) @@ -98,7 +105,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 3.2) + activesupport (~> 4.2) fog m mime-types (~> 2.6.1)