From 7a3b66c44fa300b01a77a306158a249191536d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 09:53:11 +0200 Subject: [PATCH 01/28] bump pg --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 83178baac..4f74fd53e 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,7 @@ gem "autoprefixer-rails", "5.1.11" ENV["DB"] ||= "mysql" gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql" -gem "pg", "0.18.1" if ENV["DB"] == "all" || ENV["DB"] == "postgres" +gem "pg", "0.18.2" if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem "activerecord-import", "0.7.0" From 7cfc960a6036486578873c7d30ac9d0456b14354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 09:54:46 +0200 Subject: [PATCH 02/28] bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4f74fd53e..eef7abe37 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ ENV["DB"] ||= "mysql" gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.2" if ENV["DB"] == "all" || ENV["DB"] == "postgres" -gem "activerecord-import", "0.7.0" +gem "activerecord-import", "0.8.0" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index dc58ffef7..fcaee9958 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM activemodel (= 4.2.2) activesupport (= 4.2.2) arel (~> 6.0) - activerecord-import (0.7.0) + activerecord-import (0.8.0) activerecord (>= 3.0) activesupport (4.2.2) i18n (~> 0.7) @@ -746,7 +746,7 @@ DEPENDENCIES actionpack-action_caching actionpack-page_caching active_model_serializers (= 0.9.3) - activerecord-import (= 0.7.0) + activerecord-import (= 0.8.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) addressable (= 2.3.8) From 8e60fa33ebb10886807b5c3b11348b3861d4b395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 09:55:23 +0200 Subject: [PATCH 03/28] bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index eef7abe37..8f4546091 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", 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.11" +gem "autoprefixer-rails", "5.2.1" # Database diff --git a/Gemfile.lock b/Gemfile.lock index fcaee9958..66784cbba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) - autoprefixer-rails (5.1.11) + autoprefixer-rails (5.2.1) execjs json backbone-on-rails (1.1.2.1) @@ -751,7 +751,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 5.1.11) + autoprefixer-rails (= 5.2.1) backbone-on-rails (= 1.1.2.1) bootstrap-sass (= 2.3.2.2) capybara (= 2.4.4) From 99c809deca11f74d7972faa4a9f58e0b6622ed43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:00:14 +0200 Subject: [PATCH 04/28] bump devise --- Gemfile | 4 ++-- Gemfile.lock | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 8f4546091..7fcbb5f23 100644 --- a/Gemfile +++ b/Gemfile @@ -22,9 +22,9 @@ gem "json", "1.8.2" # Authentication -gem "devise", "3.4.1" +gem "devise", "3.5.1" gem "devise_lastseenable", "0.0.4" -gem "devise-token_authenticatable", "~> 0.3.0" +gem "devise-token_authenticatable", "~> 0.4.0" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 66784cbba..d2bdaad34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,15 +137,15 @@ GEM nokogiri (~> 1.5) rails (>= 3, < 5) database_cleaner (1.4.1) - devise (3.4.1) + devise (3.5.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) responders thread_safe (~> 0.1) warden (~> 1.2.3) - devise-token_authenticatable (0.3.0) - devise (~> 3.4.0) + devise-token_authenticatable (0.4.0) + devise (~> 3.5.0) devise_lastseenable (0.0.4) devise rails (>= 3.0.4) @@ -760,8 +760,8 @@ DEPENDENCIES configurate (= 0.3.1) cucumber-rails (= 1.4.2) database_cleaner (= 1.4.1) - devise (= 3.4.1) - devise-token_authenticatable (~> 0.3.0) + devise (= 3.5.1) + devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.4) diaspora-vines (~> 0.1.27) entypo-rails (= 2.2.3) From 54dabe446f67302e4a53f40eb2f84ff6899e943e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:00:59 +0200 Subject: [PATCH 05/28] bump fog --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 7fcbb5f23..2381d6f9a 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ gem "activerecord-import", "0.8.0" # File uploading gem "carrierwave", "0.10.0" -gem "fog", "1.30.0" +gem "fog", "1.31.0" gem "mini_magick", "4.2.3" gem "remotipart", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index d2bdaad34..ae5748787 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,11 +206,11 @@ GEM fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) - fog (1.30.0) + fog (1.31.0) fog-atmos fog-aws (~> 0.0) fog-brightbox (~> 0.4) - fog-core (~> 1.27, >= 1.27.4) + fog-core (~> 1.30) fog-ecloud fog-google (>= 0.0.2) fog-json @@ -232,7 +232,7 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.1.2) + fog-aws (0.5.0) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) @@ -241,30 +241,30 @@ GEM fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.30.0) + fog-core (1.31.1) builder excon (~> 0.45) formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) - fog-ecloud (0.1.1) + fog-ecloud (0.1.3) fog-core fog-xml fog-google (0.0.5) fog-core fog-json fog-xml - fog-json (1.0.1) + fog-json (1.0.2) fog-core (~> 1.0) - multi_json (~> 1.0) + multi_json (~> 1.10) 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-profitbricks (0.0.3) fog-core fog-xml nokogiri @@ -282,7 +282,7 @@ GEM fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (0.4.5) + fog-softlayer (0.4.6) fog-core fog-json fog-storm_on_demand (0.1.1) @@ -772,7 +772,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.9.1) fixture_builder (= 0.4.1) - fog (= 1.30.0) + fog (= 1.31.0) fuubar (= 2.0.0) gon (= 5.2.3) guard (= 2.12.5) From 4c525abe028b40f4b35ba73841d2ee60935c61f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:02:21 +0200 Subject: [PATCH 06/28] bump guard --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2381d6f9a..2fad3c3bf 100644 --- a/Gemfile +++ b/Gemfile @@ -225,7 +225,7 @@ group :development do # Automatic test runs gem "guard-cucumber", "1.5.4" gem "guard-jshintrb", "1.1.1" - gem "guard-rspec", "4.5.0" + gem "guard-rspec", "4.5.2" gem "guard-rubocop", "1.2.0" gem "guard", "2.12.5", require: false gem "rb-fsevent", "0.9.4", require: false diff --git a/Gemfile.lock b/Gemfile.lock index ae5748787..34addb15d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -332,7 +332,7 @@ GEM guard-jshintrb (1.1.1) guard (~> 2.0) jshintrb - guard-rspec (4.5.0) + guard-rspec (4.5.2) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -778,7 +778,7 @@ DEPENDENCIES guard (= 2.12.5) guard-cucumber (= 1.5.4) guard-jshintrb (= 1.1.1) - guard-rspec (= 4.5.0) + guard-rspec (= 4.5.2) guard-rubocop (= 1.2.0) haml (= 4.0.6) handlebars_assets (= 0.20.1) From 66c5280c61c9657113fe740820edae49a2bd8dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:03:29 +0200 Subject: [PATCH 07/28] bump handlebars_assets --- Gemfile | 12 ++++++------ Gemfile.lock | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 2fad3c3bf..952b69dcc 100644 --- a/Gemfile +++ b/Gemfile @@ -83,12 +83,12 @@ gem "entypo-rails", "2.2.3" # JavaScript -gem "backbone-on-rails", "1.1.2.1" -gem "handlebars_assets", "0.20.1" -gem "jquery-rails", "4.0.4" -gem "jquery-ui-rails", "5.0.3" -gem "js_image_paths", "0.0.2" -gem "js-routes", "1.0.1" +gem "backbone-on-rails", "1.1.2.1" +gem "handlebars_assets", "0.20.2" +gem "jquery-rails", "4.0.4" +gem "jquery-ui-rails", "5.0.3" +gem "js_image_paths", "0.0.2" +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 34addb15d..38a3f3840 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -341,10 +341,10 @@ GEM rubocop (~> 0.20) haml (4.0.6) tilt - handlebars_assets (0.20.1) + handlebars_assets (0.20.2) execjs (~> 2.0) multi_json (~> 1.0) - sprockets (~> 2.0) + sprockets (>= 2.0.0, < 4.0) tilt (~> 1.2) hashie (3.4.1) hike (1.2.3) @@ -781,7 +781,7 @@ DEPENDENCIES guard-rspec (= 4.5.2) guard-rubocop (= 1.2.0) haml (= 4.0.6) - handlebars_assets (= 0.20.1) + handlebars_assets (= 0.20.2) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) jasmine (= 2.2.0) From da49bb2946f8622b958c7f9f910844af42990ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:04:04 +0200 Subject: [PATCH 08/28] bump jquery-ui-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 952b69dcc..61109a9d8 100644 --- a/Gemfile +++ b/Gemfile @@ -86,7 +86,7 @@ gem "entypo-rails", "2.2.3" gem "backbone-on-rails", "1.1.2.1" gem "handlebars_assets", "0.20.2" gem "jquery-rails", "4.0.4" -gem "jquery-ui-rails", "5.0.3" +gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.0.2" gem "js-routes", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 38a3f3840..df0409a55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -377,7 +377,7 @@ GEM rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.3) + jquery-ui-rails (5.0.5) railties (>= 3.2.16) js-routes (1.0.1) railties (>= 3.2) @@ -787,7 +787,7 @@ DEPENDENCIES jasmine (= 2.2.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.0.4) - jquery-ui-rails (= 5.0.3) + jquery-ui-rails (= 5.0.5) js-routes (= 1.0.1) js_image_paths (= 0.0.2) jshintrb (= 0.3.0) From fbbeffb645b44a50a659a897a83b4830a2b03598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:04:26 +0200 Subject: [PATCH 09/28] bump json --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 61109a9d8..4128a4d1f 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem "unicorn", "4.9.0", require: false # API and JSON gem "acts_as_api", "0.4.2" -gem "json", "1.8.2" +gem "json", "1.8.3" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index df0409a55..9b309307a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -388,7 +388,7 @@ GEM execjs multi_json (>= 1.3) rake - json (1.8.2) + json (1.8.3) jwt (1.4.1) kaminari (0.16.3) actionpack (>= 3.0.0) @@ -791,7 +791,7 @@ DEPENDENCIES js-routes (= 1.0.1) js_image_paths (= 0.0.2) jshintrb (= 0.3.0) - json (= 1.8.2) + json (= 1.8.3) logging-rails (= 0.5.0) markerb (= 1.0.2) messagebus_ruby_api (= 1.0.3) From 4365c5935e647e1b9fcdf142b6d7fbce2531cbe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:04:52 +0200 Subject: [PATCH 10/28] bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4128a4d1f..2c87417e2 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ gem "activerecord-import", "0.8.0" gem "carrierwave", "0.10.0" gem "fog", "1.31.0" -gem "mini_magick", "4.2.3" +gem "mini_magick", "4.2.7" gem "remotipart", "1.2.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 9b309307a..3f2cbedab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -418,7 +418,7 @@ GEM messagebus_ruby_api (1.0.3) method_source (0.8.2) mime-types (2.6.1) - mini_magick (4.2.3) + mini_magick (4.2.7) mini_portile (0.6.2) minitest (5.7.0) mobile-fu (1.3.1) @@ -795,7 +795,7 @@ DEPENDENCIES logging-rails (= 0.5.0) markerb (= 1.0.2) messagebus_ruby_api (= 1.0.3) - mini_magick (= 4.2.3) + mini_magick (= 4.2.7) minitest mobile-fu (= 1.3.1) mysql2 (= 0.3.18) From e0966d0f482b515057c4597644c35015d24e7236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:05:18 +0200 Subject: [PATCH 11/28] bump rb-fsevent --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2c87417e2..bdfd4494d 100644 --- a/Gemfile +++ b/Gemfile @@ -228,7 +228,7 @@ group :development do gem "guard-rspec", "4.5.2" gem "guard-rubocop", "1.2.0" gem "guard", "2.12.5", require: false - gem "rb-fsevent", "0.9.4", require: false + gem "rb-fsevent", "0.9.5", require: false gem "rb-inotify", "0.9.5", require: false # Linters diff --git a/Gemfile.lock b/Gemfile.lock index 3f2cbedab..bb78d486c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -588,7 +588,7 @@ GEM rainbow (2.0.0) raindrops (0.13.0) rake (10.4.2) - rb-fsevent (0.9.4) + rb-fsevent (0.9.5) rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.2.3) @@ -839,7 +839,7 @@ DEPENDENCIES rails-i18n (= 4.0.4) rails-timeago (= 2.11.0) rails_admin (= 0.6.7) - rb-fsevent (= 0.9.4) + rb-fsevent (= 0.9.5) rb-inotify (= 0.9.5) redcarpet (= 3.2.3) remotipart (= 1.2.1) From cb0dd55355fec8e6ed9243222b8856cbb62e25b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:06:56 +0200 Subject: [PATCH 12/28] bump redcarpet --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index bdfd4494d..98b91e85d 100644 --- a/Gemfile +++ b/Gemfile @@ -128,7 +128,7 @@ gem "messagebus_ruby_api", "1.0.3" # Parsing gem "nokogiri", "1.6.6.2" -gem "redcarpet", "3.2.3" +gem "redcarpet", "3.3.1" gem "twitter-text", "1.12.0" gem "roxml", "3.1.6" gem "ruby-oembed", "0.8.14" diff --git a/Gemfile.lock b/Gemfile.lock index bb78d486c..811164064 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -591,7 +591,7 @@ GEM rb-fsevent (0.9.5) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.3) + redcarpet (3.3.1) redis (3.2.1) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) @@ -841,7 +841,7 @@ DEPENDENCIES rails_admin (= 0.6.7) rb-fsevent (= 0.9.5) rb-inotify (= 0.9.5) - redcarpet (= 3.2.3) + redcarpet (= 3.3.1) remotipart (= 1.2.1) responders (= 2.1.0) roxml (= 3.1.6) From ccb183c42c886f7628ebffe9254ed7719695493a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:07:23 +0200 Subject: [PATCH 13/28] bump rspec-rails --- Gemfile | 2 +- Gemfile.lock | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index 98b91e85d..bf7fe8a0d 100644 --- a/Gemfile +++ b/Gemfile @@ -279,7 +279,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.2.1" + gem "rspec-rails", "3.3.2" # Cucumber (integration tests) gem "cucumber-rails", "1.4.2", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 811164064..e99cbe0cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -485,7 +485,7 @@ GEM pry quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.2) + rack (1.6.4) rack-cors (0.4.0) rack-google-analytics (1.2.0) actionpack @@ -602,29 +602,29 @@ GEM roxml (3.1.6) activesupport (>= 2.3.0) nokogiri (>= 1.3.3) - rspec (3.2.0) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-core (3.2.3) - rspec-support (~> 3.2.0) - rspec-expectations (3.2.1) + rspec (3.3.0) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-core (3.3.1) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) + rspec-support (~> 3.3.0) rspec-instafail (0.2.6) rspec - rspec-mocks (3.2.1) + rspec-mocks (3.3.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-rails (3.2.1) + rspec-support (~> 3.3.0) + rspec-rails (3.3.2) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-support (~> 3.2.0) - rspec-support (3.2.2) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) rubocop (0.31.0) astrolabe (~> 1.3) parser (>= 2.2.2.1, < 3.0) @@ -846,7 +846,7 @@ DEPENDENCIES responders (= 2.1.0) roxml (= 3.1.6) rspec-instafail (= 0.2.6) - rspec-rails (= 3.2.1) + rspec-rails (= 3.3.2) rubocop (= 0.31.0) ruby-oembed (= 0.8.14) rubyzip (= 1.1.7) From 1d1a23c74e24e9845bb3380406ac58838f6fe071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:07:51 +0200 Subject: [PATCH 14/28] bump rubocop --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index bf7fe8a0d..d37962c77 100644 --- a/Gemfile +++ b/Gemfile @@ -233,7 +233,7 @@ group :development do # Linters gem "jshintrb", "0.3.0" - gem "rubocop", "0.31.0" + gem "rubocop", "0.32.0" # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index e99cbe0cc..031891bbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -470,7 +470,7 @@ GEM faraday (~> 0.9.0) nokogiri (~> 1.6) orm_adapter (0.5.0) - parser (2.2.2.2) + parser (2.2.2.5) ast (>= 1.1, < 3.0) phantomjs (1.9.8.0) powerpack (0.1.1) @@ -625,9 +625,9 @@ GEM rspec-mocks (~> 3.3.0) rspec-support (~> 3.3.0) rspec-support (3.3.0) - rubocop (0.31.0) + rubocop (0.32.0) astrolabe (~> 1.3) - parser (>= 2.2.2.1, < 3.0) + parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) @@ -847,7 +847,7 @@ DEPENDENCIES roxml (= 3.1.6) rspec-instafail (= 0.2.6) rspec-rails (= 3.3.2) - rubocop (= 0.31.0) + rubocop (= 0.32.0) ruby-oembed (= 0.8.14) rubyzip (= 1.1.7) sass-rails (= 5.0.1) From 403f49cd501c9a421dd0ebc5ed4eed2fab67421c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:10:10 +0200 Subject: [PATCH 15/28] bump spring --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d37962c77..921c12cd5 100644 --- a/Gemfile +++ b/Gemfile @@ -237,7 +237,7 @@ group :development do # Preloading environment - gem "spring", "1.3.5" + gem "spring", "1.3.6" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 031891bbd..9f0e7ecba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -676,7 +676,7 @@ GEM sinon-rails (1.10.3) railties (>= 3.1) slop (3.6.0) - spring (1.3.5) + spring (1.3.6) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.4) @@ -859,7 +859,7 @@ DEPENDENCIES simplecov (= 0.10.0) sinatra (= 1.4.6) sinon-rails (= 1.10.3) - spring (= 1.3.5) + spring (= 1.3.6) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.1) From 97dd149aa0b820f0c834f8bc7c62c8faf2ee8d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:10:39 +0200 Subject: [PATCH 16/28] bump timecop --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 921c12cd5..21d7dd75b 100644 --- a/Gemfile +++ b/Gemfile @@ -272,7 +272,7 @@ group :test do # General helpers gem "factory_girl_rails", "4.5.0" - gem "timecop", "0.7.3" + gem "timecop", "0.7.4" 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 9f0e7ecba..2cc7dd93e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -697,7 +697,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timecop (0.7.3) + timecop (0.7.4) timers (4.0.1) hitimes twitter (5.14.0) @@ -863,7 +863,7 @@ DEPENDENCIES spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.1) - timecop (= 0.7.3) + timecop (= 0.7.4) twitter (= 5.14.0) twitter-text (= 1.12.0) typhoeus (= 0.7.1) From 9032059535a2cd41fba56ede57c4e1c6aad1f357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:11:03 +0200 Subject: [PATCH 17/28] bump uuid --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 21d7dd75b..5180030c1 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem "mini_magick", "4.2.7" gem "remotipart", "1.2.1" # GUID generation -gem "uuid", "2.3.7" +gem "uuid", "2.3.8" # Icons diff --git a/Gemfile.lock b/Gemfile.lock index 2cc7dd93e..f3fac11b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -727,7 +727,7 @@ GEM kgio (~> 2.6) rack raindrops (~> 0.7) - uuid (2.3.7) + uuid (2.3.8) macaddr (~> 1.0) warden (1.2.3) rack (>= 1.0) @@ -869,7 +869,7 @@ DEPENDENCIES typhoeus (= 0.7.1) uglifier (= 2.7.1) unicorn (= 4.9.0) - uuid (= 2.3.7) + uuid (= 2.3.8) webmock (= 1.21.0) will_paginate (= 3.0.7) From 7d741b8d8bf910d97e81ea78b05066246537449e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:14:15 +0200 Subject: [PATCH 18/28] bump hashie --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f3fac11b6..ce02187e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -346,7 +346,7 @@ GEM multi_json (~> 1.0) sprockets (>= 2.0.0, < 4.0) tilt (~> 1.2) - hashie (3.4.1) + hashie (3.4.2) hike (1.2.3) hiredis (0.5.2) hitimes (1.2.2) From f73e7c1b6de3170bad65bfac53d096c4b8c6634e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:17:00 +0200 Subject: [PATCH 19/28] bump jasmine-core --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ce02187e4..1596d78d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -371,7 +371,7 @@ GEM phantomjs rack (>= 1.2.1) rake - jasmine-core (2.2.0) + jasmine-core (2.3.4) jasmine-jquery-rails (2.0.3) jquery-rails (4.0.4) rails-dom-testing (~> 1.0) From 65708cb11dc3340d4f2cd791b3bcc30e6c60de2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:17:41 +0200 Subject: [PATCH 20/28] bump rails-assets-jasmine --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1596d78d8..653348fde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -523,7 +523,7 @@ GEM rails-assets-highlightjs (8.5.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) - rails-assets-jasmine (2.3.1) + rails-assets-jasmine (2.3.4) rails-assets-jasmine-ajax (3.1.1) rails-assets-jasmine (~> 2) rails-assets-jeresig--jquery.hotkeys (0.2.0) From 7309ba81e2ee96b3597c3497a9bf84b4ba2dc7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:18:10 +0200 Subject: [PATCH 21/28] bump jwt --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 653348fde..ce17e83fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,7 +389,7 @@ GEM multi_json (>= 1.3) rake json (1.8.3) - jwt (1.4.1) + jwt (1.5.0) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) From bdcdf55f84ccc1c78c4cfb03ea75752ce30746ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 8 Jun 2015 10:19:56 +0200 Subject: [PATCH 22/28] bump rails-assets-jquery.slimscroll --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ce17e83fd..d03db76b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -542,7 +542,7 @@ GEM rails-assets-jquery rails-assets-jquery-ui (1.10.4) rails-assets-jquery (>= 1.6) - rails-assets-jquery.slimscroll (1.3.3) + rails-assets-jquery.slimscroll (1.3.6) rails-assets-jquery (>= 1.7) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) rails-assets-markdown-it (4.2.2) From b5413f1050f12775515653e13424f03ab34bcb9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 14 Jun 2015 21:05:36 +0200 Subject: [PATCH 23/28] bump rails_admin --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5180030c1..e6b25d9b6 100644 --- a/Gemfile +++ b/Gemfile @@ -196,7 +196,7 @@ gem "minitest" group :production do # we don"t install these on travis to speed up test runs # Administration - gem "rails_admin", "0.6.7" + gem "rails_admin", "0.6.8" # Analytics diff --git a/Gemfile.lock b/Gemfile.lock index d03db76b1..a044b0ad4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -566,7 +566,7 @@ GEM rails-timeago (2.11.0) actionpack (>= 3.1) activesupport (>= 3.1) - rails_admin (0.6.7) + rails_admin (0.6.8) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -838,7 +838,7 @@ DEPENDENCIES rails-assets-perfect-scrollbar (= 0.6.2)! rails-i18n (= 4.0.4) rails-timeago (= 2.11.0) - rails_admin (= 0.6.7) + rails_admin (= 0.6.8) rb-fsevent (= 0.9.5) rb-inotify (= 0.9.5) redcarpet (= 3.3.1) From d7b82515035be29bf1d8d4d65fea6ad922535711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 16 Jun 2015 23:54:50 +0200 Subject: [PATCH 24/28] bump sinon-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e6b25d9b6..d03ddd95a 100644 --- a/Gemfile +++ b/Gemfile @@ -288,7 +288,7 @@ group :development, :test do gem "jasmine", "2.2.0" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org" - gem "sinon-rails", "1.10.3" + gem "sinon-rails", "1.15.0" # silence assets gem "quiet_assets", "1.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index a044b0ad4..5437b6dc7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -673,7 +673,7 @@ GEM rack (~> 1.4) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - sinon-rails (1.10.3) + sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) spring (1.3.6) @@ -858,7 +858,7 @@ DEPENDENCIES simple_captcha2 (= 0.3.4) simplecov (= 0.10.0) sinatra (= 1.4.6) - sinon-rails (= 1.10.3) + sinon-rails (= 1.15.0) spring (= 1.3.6) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) From 4307e9b53a526b27ecdf2aac983f4819d3f9942a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 22 Jun 2015 15:36:10 +0200 Subject: [PATCH 25/28] bump typhoeus --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index d03ddd95a..fd1bacaf8 100644 --- a/Gemfile +++ b/Gemfile @@ -161,7 +161,7 @@ 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" -gem "typhoeus", "0.7.1" +gem "typhoeus", "0.7.2" # Views diff --git a/Gemfile.lock b/Gemfile.lock index 5437b6dc7..186183fc2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,7 @@ GEM railties (>= 3.1, <= 5) equalizer (0.0.11) erubis (2.7.0) - ethon (0.7.3) + ethon (0.7.4) ffi (>= 1.3.0) eventmachine (1.0.7) excon (0.45.3) @@ -713,8 +713,8 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.12.0) unf (~> 0.1.0) - typhoeus (0.7.1) - ethon (>= 0.7.1) + typhoeus (0.7.2) + ethon (>= 0.7.4) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.1) @@ -866,7 +866,7 @@ DEPENDENCIES timecop (= 0.7.4) twitter (= 5.14.0) twitter-text (= 1.12.0) - typhoeus (= 0.7.1) + typhoeus (= 0.7.2) uglifier (= 2.7.1) unicorn (= 4.9.0) uuid (= 2.3.8) From e8bcaf98cadc9b51a0408b4a826284a5b44c3359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 22 Jun 2015 15:38:15 +0200 Subject: [PATCH 26/28] bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fd1bacaf8..054d1c57e 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha" # Background processing -gem "sidekiq", "3.3.4" +gem "sidekiq", "3.4.1" gem "sinatra", "1.4.6" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index 186183fc2..0708938fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -650,8 +650,8 @@ GEM shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (3.3.4) - celluloid (>= 0.16.0) + sidekiq (3.4.1) + celluloid (~> 0.16.0) connection_pool (>= 2.1.1) json redis (>= 3.0.6) @@ -853,7 +853,7 @@ DEPENDENCIES sass-rails (= 5.0.1) selenium-webdriver (= 2.45.0) shoulda-matchers (= 2.8.0) - sidekiq (= 3.3.4) + sidekiq (= 3.4.1) sidetiq (= 0.6.3) simple_captcha2 (= 0.3.4) simplecov (= 0.10.0) From bd96bb060736d36affcc04e9a44a114ed9480290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 22 Jun 2015 15:39:45 +0200 Subject: [PATCH 27/28] bump cucumber --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0708938fb..e613a2639 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,7 +124,7 @@ GEM connection_pool (2.2.0) crack (0.4.2) safe_yaml (~> 1.0.0) - cucumber (1.3.19) + cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) From 6c2e93c01d9aa6c7708927b9f9cb5fe895b163e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 22 Jun 2015 15:40:54 +0200 Subject: [PATCH 28/28] bump listen --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e613a2639..9638db539 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -394,7 +394,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.9.3) - listen (2.10.0) + listen (2.10.1) celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9)