diff --git a/Gemfile b/Gemfile index 1a5f4c0b..04a67307 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "actionpack-action_caching", "~> 1.2" gem "active_record_union", "~> 1.3" gem "acts-as-taggable-on", "~> 5.0" gem "acts_as_follower", github: "forem/acts_as_follower", branch: "master" -gem "addressable", "~> 2.5", ">= 2.5.2" +gem "addressable", "~> 2.8" gem "administrate", "~> 0.11" gem "ahoy_email", "~> 0.5" gem "airbrake", "~> 8.1" diff --git a/Gemfile.lock b/Gemfile.lock index c7c050cf..9aea3ec3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,8 +74,8 @@ GEM tzinfo (~> 1.1) acts-as-taggable-on (5.0.0) activerecord (>= 4.2.8) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) administrate (0.11.0) actionpack (>= 4.2, < 6.0) actionview (>= 4.2, < 6.0) @@ -604,7 +604,7 @@ GEM msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.2.3) mustermann (1.0.3) nakayoshi_fork (0.0.4) naught (1.1.0) @@ -659,7 +659,7 @@ GEM pry (~> 0.10) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (3.0.3) + public_suffix (4.0.7) puma (3.12.0) pundit (2.0.1) activesupport (>= 3.0.0) @@ -809,9 +809,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) sax-machine (1.3.2) sdoc (1.0.0) rdoc (>= 5.0) @@ -949,7 +949,7 @@ DEPENDENCIES active_record_union (~> 1.3) acts-as-taggable-on (~> 5.0) acts_as_follower! - addressable (~> 2.5, >= 2.5.2) + addressable (~> 2.8) administrate (~> 0.11) ahoy_email (~> 0.5) airbrake (~> 8.1)