From 3eb32a6c6094ace8f6e2e72df418d3d5b4758ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 14:57:37 +0200 Subject: [PATCH 01/14] bump database_cleaner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a570f3ee5..4edba0893 100644 --- a/Gemfile +++ b/Gemfile @@ -260,7 +260,7 @@ group :test do # Cucumber (integration tests) gem "capybara", "2.5.0" - gem "database_cleaner" , "1.5.0" + gem "database_cleaner" , "1.5.1" gem "selenium-webdriver", "2.47.1" # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index 8004170f1..c890bd9c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,7 @@ GEM mime-types (>= 1.16, < 3) nokogiri (~> 1.5) rails (>= 3, < 5) - database_cleaner (1.5.0) + database_cleaner (1.5.1) devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -769,7 +769,7 @@ DEPENDENCIES compass-rails (= 2.0.5) configurate (= 0.3.1) cucumber-rails (= 1.4.2) - database_cleaner (= 1.5.0) + database_cleaner (= 1.5.1) devise (= 3.5.2) devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) From fb923a188e24005c37d2eff56b1b248f60b6d94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 14:58:05 +0200 Subject: [PATCH 02/14] bump faraday --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4edba0893..698ebc6c3 100644 --- a/Gemfile +++ b/Gemfile @@ -157,7 +157,7 @@ gem "acts-as-taggable-on", "3.5.0" # URIs and HTTP gem "addressable", "2.3.8", require: "addressable/uri" -gem "faraday", "0.9.1" +gem "faraday", "0.9.2" gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "0.8.0" diff --git a/Gemfile.lock b/Gemfile.lock index c890bd9c0..25ac18dfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,7 +153,7 @@ GEM http_parser.rb (~> 0.6) nokogiri (~> 1.6) diaspora_federation (0.0.8) - faraday (~> 0.9.0) + faraday (~> 0.9.2) faraday_middleware (~> 0.10.0) nokogiri (~> 1.6, >= 1.6.6) typhoeus (~> 0.7) @@ -197,7 +197,7 @@ GEM factory_girl_rails (4.5.0) factory_girl (~> 4.5.0) railties (>= 3.0.0) - faraday (0.9.1) + faraday (0.9.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) From 6bc1314b436647dcdb6728b0205aa9ce1b18a1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 14:58:33 +0200 Subject: [PATCH 03/14] bump handlebars_assets --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 698ebc6c3..0cf06bd4f 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,7 @@ gem "entypo-rails", "2.2.3" # JavaScript gem "backbone-on-rails", "1.2.0.0" -gem "handlebars_assets", "0.20.2" +gem "handlebars_assets", "0.21.0" gem "jquery-rails", "4.0.5" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.0.2" diff --git a/Gemfile.lock b/Gemfile.lock index 25ac18dfe..ee529d102 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -350,7 +350,7 @@ GEM rubocop (~> 0.20) haml (4.0.7) tilt - handlebars_assets (0.20.2) + handlebars_assets (0.21.0) execjs (~> 2.0) multi_json (~> 1.0) sprockets (>= 2.0.0, < 4.0) @@ -792,7 +792,7 @@ DEPENDENCIES guard-rspec (= 4.6.4) guard-rubocop (= 1.2.0) haml (= 4.0.7) - handlebars_assets (= 0.20.2) + handlebars_assets (= 0.21.0) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) jasmine (= 2.3.1) From b1318779a68b4d48c46ce1a61cb1b11c6ef7fccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 14:59:02 +0200 Subject: [PATCH 04/14] bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0cf06bd4f..06ee5788e 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ gem "activerecord-import", "0.10.0" gem "carrierwave", "0.10.0" gem "fog", "1.34.0" -gem "mini_magick", "4.3.3" +gem "mini_magick", "4.3.6" gem "remotipart", "1.2.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index ee529d102..df1e0f718 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -431,7 +431,7 @@ GEM messagebus_ruby_api (1.0.3) method_source (0.8.2) mime-types (2.6.2) - mini_magick (4.3.3) + mini_magick (4.3.6) mini_portile (0.6.2) minitest (5.8.1) mobile-fu (1.3.1) @@ -807,7 +807,7 @@ DEPENDENCIES logging-rails (= 0.5.0) markerb (= 1.1.0) messagebus_ruby_api (= 1.0.3) - mini_magick (= 4.3.3) + mini_magick (= 4.3.6) minitest mobile-fu (= 1.3.1) mysql2 (= 0.3.20) From bd427ea2db5082e95924b0e6515b6e98d62dc7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:08:39 +0200 Subject: [PATCH 05/14] bump pry --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index df1e0f718..cd2c4b290 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -487,7 +487,7 @@ GEM ast (>= 1.1, < 3.0) phantomjs (1.9.8.0) powerpack (0.1.1) - pry (0.10.1) + pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) From 19875a59e06baf1555af632374e1d38f1e604876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:09:39 +0200 Subject: [PATCH 06/14] bump rails-assets-jquery-placeholder --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 06ee5788e..ded705356 100644 --- a/Gemfile +++ b/Gemfile @@ -105,7 +105,7 @@ source "https://rails-assets.org" do # jQuery plugins gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" - gem "rails-assets-jquery-placeholder", "2.1.2" + gem "rails-assets-jquery-placeholder", "2.1.3" gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-perfect-scrollbar", "0.6.7" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" diff --git a/Gemfile.lock b/Gemfile.lock index cd2c4b290..8ae2a6872 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -547,7 +547,7 @@ GEM rails-assets-jquery (>= 1.4.2) rails-assets-jquery (1.11.2) rails-assets-jquery-fullscreen-plugin (0.5.0) - rails-assets-jquery-placeholder (2.1.2) + rails-assets-jquery-placeholder (2.1.3) rails-assets-jquery (>= 1.6) rails-assets-jquery-textchange (0.2.3) rails-assets-jquery @@ -835,7 +835,7 @@ DEPENDENCIES rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jquery (= 1.11.2)! - rails-assets-jquery-placeholder (= 2.1.2)! + rails-assets-jquery-placeholder (= 2.1.3)! rails-assets-jquery-textchange (= 0.2.3)! rails-assets-markdown-it (= 5.0.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! From e0e2ab01afa4b4e52e41b43a60fab66c1934c489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:11:06 +0200 Subject: [PATCH 07/14] bump redcarpet --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ded705356..fc80aa9f6 100644 --- a/Gemfile +++ b/Gemfile @@ -127,7 +127,7 @@ gem "messagebus_ruby_api", "1.0.3" # Parsing gem "nokogiri", "1.6.6.2" -gem "redcarpet", "3.3.2" +gem "redcarpet", "3.3.3" gem "twitter-text", "1.13.0" gem "roxml", "3.1.6" gem "ruby-oembed", "0.8.14" diff --git a/Gemfile.lock b/Gemfile.lock index 8ae2a6872..363fd0771 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -602,7 +602,7 @@ GEM rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.3.2) + redcarpet (3.3.3) redis (3.2.1) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) @@ -850,7 +850,7 @@ DEPENDENCIES rails_admin (= 0.7.0) rb-fsevent (= 0.9.6) rb-inotify (= 0.9.5) - redcarpet (= 3.3.2) + redcarpet (= 3.3.3) remotipart (= 1.2.1) responders (= 2.1.0) roxml (= 3.1.6) From 6404f5df2b799c5b0ad76516b2d6b4c31fde2e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:12:30 +0200 Subject: [PATCH 08/14] bump rubocop --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index fc80aa9f6..e1eaa6264 100644 --- a/Gemfile +++ b/Gemfile @@ -232,7 +232,7 @@ group :development do # Linters gem "jshintrb", "0.3.0" - gem "rubocop", "0.32.1" + gem "rubocop", "0.34.2" # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index 363fd0771..5fc82488a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -636,7 +636,7 @@ GEM rspec-mocks (~> 3.3.0) rspec-support (~> 3.3.0) rspec-support (3.3.0) - rubocop (0.32.1) + rubocop (0.34.2) astrolabe (~> 1.3) parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) @@ -856,7 +856,7 @@ DEPENDENCIES roxml (= 3.1.6) rspec-instafail (= 0.4.0) rspec-rails (= 3.3.3) - rubocop (= 0.32.1) + rubocop (= 0.34.2) ruby-oembed (= 0.8.14) rubyzip (= 1.1.7) sass-rails (= 5.0.4) From c0c4b7277b95612418d8651bcb7eba5c64c6707c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:14:20 +0200 Subject: [PATCH 09/14] bump shoulda-matchers --- Gemfile | 2 +- Gemfile.lock | 6 +++--- spec/spec_helper.rb | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index e1eaa6264..9d5df3885 100644 --- a/Gemfile +++ b/Gemfile @@ -268,7 +268,7 @@ group :test do gem "factory_girl_rails", "4.5.0" gem "timecop", "0.8.0" gem "webmock", "1.21.0", require: false - gem "shoulda-matchers", "2.8.0", require: false + gem "shoulda-matchers", "3.0.0" end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 5fc82488a..c5eacda06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -659,8 +659,8 @@ GEM rubyzip (~> 1.0) websocket (~> 1.0) shellany (0.0.1) - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) + shoulda-matchers (3.0.0) + activesupport (>= 4.0.0) sidekiq (3.4.2) celluloid (~> 0.16.0) connection_pool (~> 2.2, >= 2.2.0) @@ -861,7 +861,7 @@ DEPENDENCIES rubyzip (= 1.1.7) sass-rails (= 5.0.4) selenium-webdriver (= 2.47.1) - shoulda-matchers (= 2.8.0) + shoulda-matchers (= 3.0.0) sidekiq (= 3.4.2) sidetiq (= 0.6.3) simple_captcha2 (= 0.3.4) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 32937f978..ca444256a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -106,3 +106,10 @@ RSpec.configure do |config| config.include FactoryGirl::Syntax::Methods end + +Shoulda::Matchers.configure do |config| + config.integrate do |with| + with.test_framework :rspec + with.library :rails + end +end From ada2913cd7217903ef96eb2c65ad5530f14c4d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:14:56 +0200 Subject: [PATCH 10/14] bump webmock --- Gemfile | 2 +- Gemfile.lock | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9d5df3885..a5a0733e8 100644 --- a/Gemfile +++ b/Gemfile @@ -267,7 +267,7 @@ group :test do gem "factory_girl_rails", "4.5.0" gem "timecop", "0.8.0" - gem "webmock", "1.21.0", require: false + gem "webmock", "1.22.1", require: false gem "shoulda-matchers", "3.0.0" end diff --git a/Gemfile.lock b/Gemfile.lock index c5eacda06..c78f66d3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -355,6 +355,7 @@ GEM multi_json (~> 1.0) sprockets (>= 2.0.0, < 4.0) tilt (~> 1.2) + hashdiff (0.2.2) hashie (3.4.2) hike (1.2.3) hiredis (0.5.2) @@ -743,9 +744,10 @@ GEM valid (1.0.2) warden (1.2.3) rack (>= 1.0) - webmock (1.21.0) + webmock (1.22.1) addressable (>= 2.3.6) crack (>= 0.3.2) + hashdiff websocket (1.2.2) will_paginate (3.0.7) xpath (2.0.0) @@ -879,7 +881,7 @@ DEPENDENCIES uglifier (= 2.7.2) unicorn (= 4.9.0) uuid (= 2.3.8) - webmock (= 1.21.0) + webmock (= 1.22.1) will_paginate (= 3.0.7) BUNDLED WITH From c79a3fa4bf78186dcc4663d2368a7049b48e21cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:16:35 +0200 Subject: [PATCH 11/14] bump fog --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c78f66d3d..f605aee32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - CFPropertyList (2.3.1) + CFPropertyList (2.3.2) actionmailer (4.2.4) actionpack (= 4.2.4) actionview (= 4.2.4) @@ -260,7 +260,7 @@ GEM fog-ecloud (0.3.0) fog-core fog-xml - fog-google (0.0.7) + fog-google (0.1.1) fog-core fog-json fog-xml @@ -285,13 +285,13 @@ GEM fog-core fog-json fog-xml - fog-sakuracloud (1.1.1) + fog-sakuracloud (1.3.3) fog-core fog-json fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (0.4.7) + fog-softlayer (1.0.0) fog-core fog-json fog-storm_on_demand (0.1.1) @@ -448,7 +448,7 @@ GEM nested_form (0.3.2) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) + net-ssh (3.0.1) nio4r (1.1.1) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) From c7a5010b37a9377ddc6fd59a57ef4b0592f7bf2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:17:07 +0200 Subject: [PATCH 12/14] bump sass --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f605aee32..8d4ad7432 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -647,7 +647,7 @@ GEM ruby-progressbar (1.7.5) rubyzip (1.1.7) safe_yaml (1.0.4) - sass (3.4.18) + sass (3.4.19) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) From a1891557738bba4be4e730b3d10e35c738904150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:17:30 +0200 Subject: [PATCH 13/14] bump valid --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8d4ad7432..3765b138e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -741,7 +741,7 @@ GEM raindrops (~> 0.7) uuid (2.3.8) macaddr (~> 1.0) - valid (1.0.2) + valid (1.1.0) warden (1.2.3) rack (>= 1.0) webmock (1.22.1) From bf42cc17f118677a0410f5b4f591dee0a9b90c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 20 Oct 2015 15:20:07 +0200 Subject: [PATCH 14/14] bump http closes #6514 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3765b138e..d847de6f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM rails (~> 4.2) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.24) + domain_name (0.5.25) unf (>= 0.0.5, < 1.0.0) eco (1.0.0) coffee-script @@ -360,7 +360,7 @@ GEM hike (1.2.3) hiredis (0.5.2) hitimes (1.2.3) - http (0.9.6) + http (0.9.8) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) @@ -781,7 +781,7 @@ DEPENDENCIES eye (= 0.7) facebox-rails (= 0.2.0) factory_girl_rails (= 4.5.0) - faraday (= 0.9.1) + faraday (= 0.9.2) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1)