diff --git a/Gemfile.lock b/Gemfile.lock index 03233de6df3..97c25c3d517 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,6 +115,8 @@ GEM railties discourse_email_parser (0.6.1) docile (1.1.5) + domain_name (0.5.25) + unf (>= 0.0.5, < 1.0.0) dotenv (2.0.2) ember-data-source (1.0.0.beta.16.1) ember-source (~> 1.8) @@ -165,6 +167,8 @@ GEM hiredis (0.6.0) hitimes (1.2.3) htmlentities (4.3.4) + http-cookie (1.0.2) + domain_name (~> 0.5) i18n (0.7.0) image_optim (0.20.2) exifr (~> 1.1, >= 1.1.3) @@ -175,8 +179,9 @@ GEM image_size (1.4.1) in_threads (1.3.1) jmespath (1.1.3) - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) + jquery-rails (4.0.5) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) jwt (1.5.1) @@ -211,7 +216,7 @@ GEM multipart-post (2.0.0) mustache (1.0.2) nenv (0.2.0) - netrc (0.10.3) + netrc (0.11.0) nokogiri (1.6.7.1) mini_portile2 (~> 2.0.0.rc2) nokogumbo (1.4.1) @@ -319,7 +324,8 @@ GEM redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) ref (2.0.0) - rest-client (1.7.2) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rinku (1.7.3) @@ -536,4 +542,4 @@ DEPENDENCIES unicorn BUNDLED WITH - 1.10.6 + 1.11.2