From 55fdf51058c8d6f8e68af10585afa3d92ba7acde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:17:44 +0200 Subject: [PATCH 01/22] bump addressable --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9f4254547..dcebaffe1 100644 --- a/Gemfile +++ b/Gemfile @@ -155,7 +155,7 @@ gem "acts-as-taggable-on", "3.5.0" # URIs and HTTP -gem "addressable", "2.3.7", require: "addressable/uri" +gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.1" gem "faraday_middleware", "0.9.1" gem "faraday-cookie_jar", "0.0.6" diff --git a/Gemfile.lock b/Gemfile.lock index ad4c6b91d..ecbb942b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.3.7) + addressable (2.3.8) arel (6.0.0) asset_sync (1.1.0) activemodel @@ -709,7 +709,7 @@ DEPENDENCIES activerecord-import (= 0.7.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) - addressable (= 2.3.7) + addressable (= 2.3.8) asset_sync (= 1.1.0) autoprefixer-rails (= 5.1.7.1) backbone-on-rails (= 1.1.2) From 16562d6d361389e99d2311e53764b68bdcba0c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:18:16 +0200 Subject: [PATCH 02/22] bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index dcebaffe1..a3ffa78b1 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem "rack-cors", "0.3.1", require: "rack/cors" gem "bootstrap-sass", "2.3.2.2" gem "compass-rails", "2.0.4" gem "sass-rails", "5.0.1" -gem "autoprefixer-rails", "5.1.7.1" +gem "autoprefixer-rails", "5.1.11" # Database diff --git a/Gemfile.lock b/Gemfile.lock index ecbb942b3..ac8aef235 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) - autoprefixer-rails (5.1.7.1) + autoprefixer-rails (5.1.11) execjs json backbone-on-rails (1.1.2.0) @@ -180,7 +180,7 @@ GEM ffi (>= 1.3.0) eventmachine (1.0.7) excon (0.44.4) - execjs (2.4.0) + execjs (2.5.2) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) @@ -711,7 +711,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 5.1.7.1) + autoprefixer-rails (= 5.1.11) backbone-on-rails (= 1.1.2) bootstrap-sass (= 2.3.2.2) capybara (= 2.4.4) From 319edd70ad3e609d3a455798dbc5a03b8690701b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:20:28 +0200 Subject: [PATCH 03/22] bump backbone-on-rails --- Gemfile | 2 +- Gemfile.lock | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index a3ffa78b1..73546edd8 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ gem "entypo-rails", "2.2.2" # JavaScript -gem "backbone-on-rails", "1.1.2" +gem "backbone-on-rails", "1.1.2.1" gem "handlebars_assets", "0.20.1" gem "jquery-rails", "4.0.3" gem "jquery-ui-rails", "5.0.3" diff --git a/Gemfile.lock b/Gemfile.lock index ac8aef235..6ba6bca11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,10 +40,6 @@ GEM arel (~> 6.0) activerecord-import (0.7.0) activerecord (>= 3.0) - activeresource (4.0.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.1) activesupport (4.2.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -68,11 +64,7 @@ GEM autoprefixer-rails (5.1.11) execjs json - backbone-on-rails (1.1.2.0) - actionmailer - actionpack - activemodel - activeresource + backbone-on-rails (1.1.2.1) eco ejs jquery-rails @@ -103,10 +95,10 @@ GEM coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) + coffee-script-source (1.9.1.1) columnize (0.9.0) compass (1.0.3) chunky_png (~> 1.2) @@ -289,7 +281,7 @@ GEM ruby-progressbar (~> 1.4) gherkin (2.12.2) multi_json (~> 1.3) - globalid (0.3.3) + globalid (0.3.5) activesupport (>= 4.1.0) gon (5.2.3) actionpack (>= 2.3.0) @@ -388,7 +380,7 @@ GEM redcarpet (>= 2.0) messagebus_ruby_api (1.0.3) method_source (0.8.2) - mime-types (2.4.3) + mime-types (2.5) mini_magick (4.2.0) mini_portile (0.6.2) minitest (5.6.1) @@ -533,8 +525,6 @@ GEM rails-i18n (4.0.4) i18n (~> 0.6) railties (~> 4.0) - rails-observers (0.1.2) - activemodel (~> 4.0) rails-timeago (2.11.0) actionpack (>= 3.1) activesupport (>= 3.1) @@ -712,7 +702,7 @@ DEPENDENCIES addressable (= 2.3.8) asset_sync (= 1.1.0) autoprefixer-rails (= 5.1.11) - backbone-on-rails (= 1.1.2) + backbone-on-rails (= 1.1.2.1) bootstrap-sass (= 2.3.2.2) capybara (= 2.4.4) carrierwave (= 0.10.0) From 5c6e20048afd00db00cc5ae7d84a7f9cb5221ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:28:04 +0200 Subject: [PATCH 04/22] bump entypo-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 73546edd8..bc5c16284 100644 --- a/Gemfile +++ b/Gemfile @@ -79,7 +79,7 @@ gem "uuid", "2.3.7" # Icons -gem "entypo-rails", "2.2.2" +gem "entypo-rails", "2.2.3" # JavaScript diff --git a/Gemfile.lock b/Gemfile.lock index 6ba6bca11..99a513e6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,7 +165,7 @@ GEM em-hiredis (0.3.0) eventmachine (~> 1.0) hiredis (~> 0.5.0) - entypo-rails (2.2.2) + entypo-rails (2.2.3) railties (>= 3.1, <= 5) erubis (2.7.0) ethon (0.7.3) @@ -714,7 +714,7 @@ DEPENDENCIES devise-token_authenticatable (~> 0.3.0) devise_lastseenable (= 0.0.4) diaspora-vines (~> 0.1.27) - entypo-rails (= 2.2.2) + entypo-rails (= 2.2.3) factory_girl_rails (= 4.5.0) faraday (= 0.9.1) faraday-cookie_jar (= 0.0.6) From 4f75205d9ff9923481f5f7f47e6ff30442ddc3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:28:47 +0200 Subject: [PATCH 05/22] bump fog --- Gemfile | 2 +- Gemfile.lock | 50 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index bc5c16284..babb7c3a1 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ gem "activerecord-import", "0.7.0" # File uploading gem "carrierwave", "0.10.0" -gem "fog", "1.28.0" +gem "fog", "1.30.0" gem "mini_magick", "4.2.0" gem "remotipart", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 99a513e6d..fa9346435 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,7 +171,7 @@ GEM ethon (0.7.3) ffi (>= 1.3.0) eventmachine (1.0.7) - excon (0.44.4) + excon (0.45.3) execjs (2.5.2) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -191,13 +191,16 @@ GEM fixture_builder (0.3.6) activerecord (>= 2) activesupport (>= 2) - fog (1.28.0) + fog (1.30.0) fog-atmos fog-aws (~> 0.0) fog-brightbox (~> 0.4) - fog-core (~> 1.27, >= 1.27.3) + fog-core (~> 1.27, >= 1.27.4) fog-ecloud + fog-google (>= 0.0.2) fog-json + fog-local + fog-powerdns (>= 0.1.1) fog-profitbricks fog-radosgw (>= 0.0.2) fog-riakcs @@ -214,7 +217,7 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.1.1) + fog-aws (0.1.2) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) @@ -223,23 +226,34 @@ GEM fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.29.0) + fog-core (1.30.0) builder - excon (~> 0.38) + excon (~> 0.45) formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) - fog-ecloud (0.0.2) + fog-ecloud (0.1.1) fog-core fog-xml - fog-json (1.0.0) + fog-google (0.0.5) + fog-core + fog-json + fog-xml + fog-json (1.0.1) + fog-core (~> 1.0) multi_json (~> 1.0) + fog-local (0.2.1) + fog-core (~> 1.27) + fog-powerdns (0.1.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) fog-profitbricks (0.0.2) fog-core fog-xml nokogiri - fog-radosgw (0.0.3) + fog-radosgw (0.0.4) fog-core (>= 1.21.0) fog-json fog-xml (>= 0.0.1) @@ -247,28 +261,28 @@ GEM fog-core fog-json fog-xml - fog-sakuracloud (1.0.0) + fog-sakuracloud (1.0.1) fog-core fog-json - fog-serverlove (0.1.1) + fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (0.4.1) + fog-softlayer (0.4.5) fog-core fog-json - fog-storm_on_demand (0.1.0) + fog-storm_on_demand (0.1.1) fog-core fog-json - fog-terremark (0.0.4) + fog-terremark (0.1.0) fog-core fog-xml - fog-vmfusion (0.0.1) + fog-vmfusion (0.1.0) fission fog-core - fog-voxel (0.0.2) + fog-voxel (0.1.0) fog-core fog-xml - fog-xml (0.1.1) + fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) font-awesome-rails (4.3.0.0) @@ -720,7 +734,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.9.1) fixture_builder (= 0.3.6) - fog (= 1.28.0) + fog (= 1.30.0) foreman (= 0.62) fuubar (= 2.0.0) gon (= 5.2.3) From ac405dddeb33c067525512d2491468960a99eb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:47:05 +0200 Subject: [PATCH 06/22] bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index babb7c3a1..88330b073 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ gem "activerecord-import", "0.7.0" gem "carrierwave", "0.10.0" gem "fog", "1.30.0" -gem "mini_magick", "4.2.0" +gem "mini_magick", "4.2.3" gem "remotipart", "1.2.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index fa9346435..4240fbb74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -395,7 +395,7 @@ GEM messagebus_ruby_api (1.0.3) method_source (0.8.2) mime-types (2.5) - mini_magick (4.2.0) + mini_magick (4.2.3) mini_portile (0.6.2) minitest (5.6.1) mobile-fu (1.3.1) @@ -757,7 +757,7 @@ DEPENDENCIES json (= 1.8.2) markerb (= 1.0.2) messagebus_ruby_api (= 1.0.3) - mini_magick (= 4.2.0) + mini_magick (= 4.2.3) minitest mobile-fu (= 1.3.1) mysql2 (= 0.3.18) From 5a6f6c68cc184d0101d1878f7124b79516de6458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:48:08 +0200 Subject: [PATCH 07/22] bump rack-cors --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 88330b073..508c7cfa3 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ gem "configurate", "0.3.1" # Cross-origin resource sharing -gem "rack-cors", "0.3.1", require: "rack/cors" +gem "rack-cors", "0.4.0", require: "rack/cors" # CSS diff --git a/Gemfile.lock b/Gemfile.lock index 4240fbb74..d29fa32d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -461,7 +461,7 @@ GEM pry-debundle (0.8) pry rack (1.6.0) - rack-cors (0.3.1) + rack-cors (0.4.0) rack-google-analytics (1.2.0) actionpack activesupport @@ -771,7 +771,7 @@ DEPENDENCIES pry pry-byebug pry-debundle - rack-cors (= 0.3.1) + rack-cors (= 0.4.0) rack-google-analytics (= 1.2.0) rack-piwik (= 0.3.0) rack-protection (= 1.5.3) From fa24333ca19e70eba9150eab1547f2d89605dbf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:48:54 +0200 Subject: [PATCH 08/22] bump rubocop --- .rubocop.yml | 8 +++----- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index e3ea0b991..2e55fe82e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -36,10 +36,8 @@ Style/AlignHash: EnforcedColonStyle: table # Mixing the styles looks just silly. -# REVIEW: Enable once https://github.com/bbatsov/rubocop/commit/760ce1ed2cf10beda5e163f934c03a6fb6daa38e -# is released. -#Style/HashSyntax: -# EnforcedStyle: ruby19_no_mixed_keys +Style/HashSyntax: + EnforcedStyle: ruby19_no_mixed_keys # has_key? and has_value? are far more readable than key? and value? Style/DeprecatedHashMethods: @@ -93,7 +91,7 @@ Style/SpaceInsideHashLiteralBraces: # { ... } for multi-line blocks is okay, follow Weirichs rule instead: # https://web.archive.org/web/20140221124509/http://onestepback.org/index.cgi/Tech/Ruby/BraceVsDoEnd.rdoc -Style/Blocks: +Style/BlockDelimiters: Enabled: false # do / end blocks should be used for side effects, diff --git a/Gemfile b/Gemfile index 508c7cfa3..0006bbc27 100644 --- a/Gemfile +++ b/Gemfile @@ -227,7 +227,7 @@ group :development do # Linters gem "jshintrb", "0.3.0" - gem "rubocop", "0.29.1" + gem "rubocop", "0.31.0" # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index d29fa32d8..b1f2499e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -447,10 +447,10 @@ GEM faraday (~> 0.9.0) nokogiri (~> 1.6) orm_adapter (0.5.0) - parser (2.2.0.3) + parser (2.2.2.2) ast (>= 1.1, < 3.0) phantomjs (1.9.8.0) - powerpack (0.1.0) + powerpack (0.1.1) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -601,9 +601,9 @@ GEM rspec-mocks (~> 3.2.0) rspec-support (~> 3.2.0) rspec-support (3.2.2) - rubocop (0.29.1) + rubocop (0.31.0) astrolabe (~> 1.3) - parser (>= 2.2.0.1, < 3.0) + parser (>= 2.2.2.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) @@ -808,7 +808,7 @@ DEPENDENCIES roxml (= 3.1.6) rspec-instafail (= 0.2.6) rspec-rails (= 3.2.1) - rubocop (= 0.29.1) + rubocop (= 0.31.0) ruby-oembed (= 0.8.14) sass-rails (= 5.0.1) selenium-webdriver (= 2.45.0) From 147ea4e39930c3f79ba210adf0e3978cc1dd7503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:55:58 +0200 Subject: [PATCH 09/22] bump spring --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0006bbc27..3fa0d707b 100644 --- a/Gemfile +++ b/Gemfile @@ -231,7 +231,7 @@ group :development do # Preloading environment - gem "spring", "1.3.3" + gem "spring", "1.3.5" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index b1f2499e8..9189d2393 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -646,7 +646,7 @@ GEM sinon-rails (1.10.3) railties (>= 3.1) slop (3.6.0) - spring (1.3.3) + spring (1.3.5) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.4) @@ -818,7 +818,7 @@ DEPENDENCIES simple_captcha2 (= 0.3.4) sinatra (= 1.4.6) sinon-rails (= 1.10.3) - spring (= 1.3.3) + spring (= 1.3.5) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.1) From a9519ede3d77934367684e3eaef505cd1300fd1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:56:38 +0200 Subject: [PATCH 10/22] bump twitter-text --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3fa0d707b..9b430c081 100644 --- a/Gemfile +++ b/Gemfile @@ -127,7 +127,7 @@ gem "messagebus_ruby_api", "1.0.3" gem "nokogiri", "1.6.6.2" gem "redcarpet", "3.2.3" -gem "twitter-text", "1.11.0" +gem "twitter-text", "1.12.0" gem "roxml", "3.1.6" gem "ruby-oembed", "0.8.14" gem "open_graph_reader", "0.6.0" diff --git a/Gemfile.lock b/Gemfile.lock index 9189d2393..d0191cb93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -673,7 +673,7 @@ GEM faraday (~> 0.8, < 0.10) multi_json (~> 1.0) simple_oauth (~> 0.2) - twitter-text (1.11.0) + twitter-text (1.12.0) unf (~> 0.1.0) typhoeus (0.7.1) ethon (>= 0.7.1) @@ -684,7 +684,7 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.6) + unf_ext (0.0.7.1) unicorn (4.8.3) kgio (~> 2.6) rack @@ -824,7 +824,7 @@ DEPENDENCIES test_after_commit (= 0.4.1) timecop (= 0.7.3) twitter (= 4.8.1) - twitter-text (= 1.11.0) + twitter-text (= 1.12.0) typhoeus (= 0.7.1) uglifier (= 2.7.1) unicorn (= 4.8.3) From 70189f05f4a2ae584a050088f337cc084e946e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:57:05 +0200 Subject: [PATCH 11/22] bump unicorn --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9b430c081..251e142c5 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "responders", "2.1.0" # Appserver -gem "unicorn", "4.8.3", require: false +gem "unicorn", "4.9.0", require: false # API and JSON diff --git a/Gemfile.lock b/Gemfile.lock index d0191cb93..2ed776444 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -685,7 +685,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.1) - unicorn (4.8.3) + unicorn (4.9.0) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -827,7 +827,7 @@ DEPENDENCIES twitter-text (= 1.12.0) typhoeus (= 0.7.1) uglifier (= 2.7.1) - unicorn (= 4.8.3) + unicorn (= 4.9.0) uuid (= 2.3.7) webmock (= 1.20.4) will_paginate (= 3.0.7) From 487afed53eff4ee9942d1097dd4d783e208ed271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:57:36 +0200 Subject: [PATCH 12/22] bump webmock --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 251e142c5..252c30bb1 100644 --- a/Gemfile +++ b/Gemfile @@ -264,7 +264,7 @@ group :test do gem "factory_girl_rails", "4.5.0" gem "timecop", "0.7.3" - gem "webmock", "1.20.4", require: false + gem "webmock", "1.21.0", require: false gem "shoulda-matchers", "2.8.0", require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 2ed776444..73fabc6e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -693,7 +693,7 @@ GEM macaddr (~> 1.0) warden (1.2.3) rack (>= 1.0) - webmock (1.20.4) + webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) websocket (1.2.1) @@ -829,6 +829,6 @@ DEPENDENCIES uglifier (= 2.7.1) unicorn (= 4.9.0) uuid (= 2.3.7) - webmock (= 1.20.4) + webmock (= 1.21.0) will_paginate (= 3.0.7) zip-zip From 2634ea07a964bc540ae2e4209683f8dc8ebce62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:58:35 +0200 Subject: [PATCH 13/22] bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 252c30bb1..82056007c 100644 --- a/Gemfile +++ b/Gemfile @@ -88,7 +88,7 @@ gem "handlebars_assets", "0.20.1" gem "jquery-rails", "4.0.3" gem "jquery-ui-rails", "5.0.3" gem "js_image_paths", "0.0.2" -gem "js-routes", "1.0.0" +gem "js-routes", "1.0.1" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails diff --git a/Gemfile.lock b/Gemfile.lock index 73fabc6e9..7b9383b21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -364,7 +364,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.3) railties (>= 3.2.16) - js-routes (1.0.0) + js-routes (1.0.1) railties (>= 3.2) sprockets-rails js_image_paths (0.0.2) @@ -751,7 +751,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.0.3) jquery-ui-rails (= 5.0.3) - js-routes (= 1.0.0) + js-routes (= 1.0.1) js_image_paths (= 0.0.2) jshintrb (= 0.3.0) json (= 1.8.2) From 1024b3b1f186a60d2a3bc9ceae0bc2d125c26319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:59:01 +0200 Subject: [PATCH 14/22] bump byebug --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7b9383b21..fa3419ec9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM bootstrap-sass (2.3.2.2) sass (~> 3.2) builder (3.2.2) - byebug (4.0.3) + byebug (4.0.5) columnize (= 0.9.0) capybara (2.4.4) mime-types (>= 1.16) From 4cf681a53822e8a4dc23967eb20c9a05ab7c26dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 15:59:21 +0200 Subject: [PATCH 15/22] bump rspec --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fa3419ec9..93c337eb9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -582,9 +582,9 @@ GEM rspec-core (~> 3.2.0) rspec-expectations (~> 3.2.0) rspec-mocks (~> 3.2.0) - rspec-core (3.2.2) + rspec-core (3.2.3) rspec-support (~> 3.2.0) - rspec-expectations (3.2.0) + rspec-expectations (3.2.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.2.0) rspec-instafail (0.2.6) From 11f4561ae5d3e61c9e19fda2e9ec6035ca00e220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 16:00:42 +0200 Subject: [PATCH 16/22] bump childprocess --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 93c337eb9..cce157c83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM mime-types (>= 1.16) celluloid (0.16.0) timers (~> 4.0.0) - childprocess (0.5.5) + childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.4) coderay (1.1.0) From e0116e268fbceb41ab4e6f16dc85906060ca4346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 16:01:15 +0200 Subject: [PATCH 17/22] bump domain_name --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cce157c83..02b7c2bde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,7 +154,7 @@ GEM http_parser.rb (~> 0.6) nokogiri (~> 1.6) diff-lcs (1.2.5) - domain_name (0.5.23) + domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) eco (1.0.0) coffee-script From b702c80fb832fe237cf85cbf22d195c2c342dab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 16:01:42 +0200 Subject: [PATCH 18/22] bump listen --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 02b7c2bde..e1865b6ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -379,8 +379,8 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.9.3) - listen (2.9.0) - celluloid (>= 0.15.2) + listen (2.10.0) + celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) loofah (2.0.1) From 5d9822056bf7d46c7ffdf7f917324d93a9281b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 4 May 2015 16:02:12 +0200 Subject: [PATCH 19/22] bump websocket --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e1865b6ba..cd088959c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -696,7 +696,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket (1.2.1) + websocket (1.2.2) will_paginate (3.0.7) xpath (2.0.0) nokogiri (~> 1.3) From 2240599f59f1140da13cdc2176ebcb0bfff2d716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 7 May 2015 21:34:34 +0200 Subject: [PATCH 20/22] bump rack --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cd088959c..759b92eb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -460,7 +460,7 @@ GEM pry (~> 0.10) pry-debundle (0.8) pry - rack (1.6.0) + rack (1.6.1) rack-cors (0.4.0) rack-google-analytics (1.2.0) actionpack From 729fc1a6bfabd4935d71eb92f19260215dd94dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 7 May 2015 21:36:51 +0200 Subject: [PATCH 21/22] bump sprockets-rails --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 759b92eb5..60a90d193 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -383,7 +383,7 @@ GEM celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - loofah (2.0.1) + loofah (2.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.9) macaddr (1.7.1) @@ -656,7 +656,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) + sprockets-rails (2.3.0) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) From 60fb6805723af2465ac2026122032a22e7df5883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 7 May 2015 21:38:40 +0200 Subject: [PATCH 22/22] bump hashie closes #5925 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 60a90d193..14a6d982e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -333,7 +333,7 @@ GEM multi_json (~> 1.0) sprockets (~> 2.0) tilt (~> 1.2) - hashie (3.4.0) + hashie (3.4.1) hike (1.2.3) hiredis (0.5.2) hitimes (1.2.2)