diff --git a/Gemfile.lock b/Gemfile.lock index b6bfdcc0..a59fd988 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT - remote: git://github.com/openpprn/forem.git - revision: 38460fd370d3222ad77c5a72e5ca3597a2d5345e + remote: https://github.com/openpprn/forem.git + revision: 5ebf0859f21b13a7381e6448b34c7c783773df21 branch: rails-4.2 specs: forem (1.0.0.beta1) @@ -48,7 +48,8 @@ GEM activerecord (~> 4.0, >= 4.0.0) acts-as-taggable-on (3.4.2) activerecord (>= 3.2, < 5) - addressable (2.3.6) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) airbrake (4.1.0) builder multi_json @@ -77,7 +78,7 @@ GEM debugger-linecache (~> 1.2) slop (~> 3.6) callsite (0.0.11) - cancancan (1.9.2) + cancancan (1.17.0) capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -103,8 +104,8 @@ GEM daemons (1.1.9) debug_inspector (0.0.2) debugger-linecache (1.2.0) - decorators (1.0.3) - railties (>= 3.0.19, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.10, != 3.2.1, != 3.2.0, != 3.1.9, != 3.1.8, != 3.1.7, != 3.1.6, != 3.1.5, != 3.1.4, != 3.1.3, != 3.1.2, != 3.1.1, != 3.1.0) + decorators (1.0.5) + railties (>= 3.0.19) devise (3.4.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -123,7 +124,7 @@ GEM ffi (1.9.6) figaro (1.0.0) thor (~> 0.14) - friendly_id (5.0.4) + friendly_id (5.0.5) activerecord (>= 4.0.0) gemoji (2.1.0) geocoder (1.2.6) @@ -183,6 +184,7 @@ GEM mini_portile (~> 0.6.0) orm_adapter (0.5.0) pg (0.17.1) + public_suffix (5.0.0) rack (1.5.2) rack-contrib (1.2.0) rack (>= 0.9.1) @@ -228,14 +230,13 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - select2-rails (3.5.9.1) - thor (~> 0.14) + select2-rails (3.5.11) selenium-webdriver (2.44.0) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) - simple_form (3.0.3) + simple_form (3.0.4) actionpack (~> 4.0) activemodel (~> 4.0) simplecov (0.9.1)