From 01b629f865e151caa3e4891840acc771788bc9bd Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 01:30:40 +0200 Subject: [PATCH 01/23] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5a667751c..500c33f47 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" gem "bootstrap-sass", "3.3.7" gem "compass-rails", "2.0.5" gem "sass-rails", "5.0.6" -gem "autoprefixer-rails", "6.4.0.2" +gem "autoprefixer-rails", "6.5.1" gem "bootstrap-switch-rails", "3.3.3" # Database diff --git a/Gemfile.lock b/Gemfile.lock index d398a53f8..a0796ac7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM unf ast (2.3.0) attr_required (1.0.1) - autoprefixer-rails (6.4.0.2) + autoprefixer-rails (6.5.1) execjs backbone-on-rails (1.2.0.0) eco @@ -922,7 +922,7 @@ DEPENDENCIES acts_as_api (= 0.4.3) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 6.4.0.2) + autoprefixer-rails (= 6.5.1) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) @@ -1054,4 +1054,4 @@ DEPENDENCIES will_paginate (= 3.1.0) BUNDLED WITH - 1.12.5 + 1.13.5 From 1b043c35cc9209e002a8d879eafa65ccecf5036f Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 01:31:47 +0200 Subject: [PATCH 02/23] Bump capybara --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 500c33f47..1a7d33223 100644 --- a/Gemfile +++ b/Gemfile @@ -272,7 +272,7 @@ group :test do # Cucumber (integration tests) - gem "capybara", "2.7.1" + gem "capybara", "2.10.1" gem "database_cleaner", "1.5.3" gem "poltergeist", "1.10.0" diff --git a/Gemfile.lock b/Gemfile.lock index a0796ac7b..c27b9c668 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM buftok (0.2.0) builder (3.2.2) byebug (9.0.5) - capybara (2.7.1) + capybara (2.10.1) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -926,7 +926,7 @@ DEPENDENCIES backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) - capybara (= 2.7.1) + capybara (= 2.10.1) carrierwave (= 0.11.2) compass-rails (= 2.0.5) configurate (= 0.3.1) From fcb9f0b34dd0dca33e93ccb0e5048f6e664a114b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 01:33:09 +0200 Subject: [PATCH 03/23] Bump cucumber-rails --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 1a7d33223..a36227253 100644 --- a/Gemfile +++ b/Gemfile @@ -297,7 +297,7 @@ group :development, :test do gem "rspec-rails", "3.5.1" # Cucumber (integration tests) - gem "cucumber-rails", "1.4.4", require: false + gem "cucumber-rails", "1.4.5", require: false # Jasmine (client side application tests (JS)) gem "jasmine", "2.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index c27b9c668..e0cef4b67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,9 +157,9 @@ GEM rspec (>= 2.12.0) cucumber-core (1.5.0) gherkin (~> 4.0) - cucumber-rails (1.4.4) + cucumber-rails (1.4.5) capybara (>= 1.1.2, < 3) - cucumber (>= 1.3.8, < 3) + cucumber (>= 1.3.8, < 4) mime-types (>= 1.16, < 4) nokogiri (~> 1.5) railties (>= 3, < 5.1) @@ -509,7 +509,7 @@ GEM mimemagic (0.3.1) mini_magick (4.5.1) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.9.1) mobile-fu (1.3.1) rack-mobile-detect rails @@ -717,7 +717,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.1.0) raindrops (0.16.0) - rake (11.2.2) + rake (11.3.0) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -932,7 +932,7 @@ DEPENDENCIES configurate (= 0.3.1) coveralls cucumber-api-steps (= 0.13) - cucumber-rails (= 1.4.4) + cucumber-rails (= 1.4.5) database_cleaner (= 1.5.3) devise (= 4.2.0) devise-token_authenticatable (= 0.5.2) From 6ce117b915458e381735a0f929d65c575045e26c Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 01:34:21 +0200 Subject: [PATCH 04/23] Bump fuubar --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index a36227253..9d6e6ff82 100644 --- a/Gemfile +++ b/Gemfile @@ -267,7 +267,7 @@ group :test do # RSpec (unit tests, some integration tests) gem "fixture_builder", "0.4.1" - gem "fuubar", "2.1.1" + gem "fuubar", "2.2.0" gem "test_after_commit", "1.1.0" # Cucumber (integration tests) diff --git a/Gemfile.lock b/Gemfile.lock index e0cef4b67..f284ba1cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -365,8 +365,8 @@ GEM font-awesome-rails (4.6.3.1) railties (>= 3.2, < 5.1) formatador (0.2.5) - fuubar (2.1.1) - rspec (~> 3.0) + fuubar (2.2.0) + rspec-core (~> 3.0) ruby-progressbar (~> 1.4) get_process_mem (0.2.1) gherkin (4.0.0) @@ -737,7 +737,7 @@ GEM rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.2) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -948,7 +948,7 @@ DEPENDENCIES faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) fog (= 1.38.0) - fuubar (= 2.1.1) + fuubar (= 2.2.0) gon (= 6.1.0) guard (= 2.14.0) guard-cucumber (= 2.1.2) From f74a51e29c6bc7903b3b3b9d2e0d5794aea6ff54 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 01:36:17 +0200 Subject: [PATCH 05/23] Bump haml_lint --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9d6e6ff82..977d7e962 100644 --- a/Gemfile +++ b/Gemfile @@ -240,7 +240,7 @@ group :development do # Linters gem "rubocop", "0.40.0" - gem "haml_lint", "0.18.1" + gem "haml_lint", "0.18.2" gem "pronto", "0.7.0" gem "pronto-eslint", "0.7.0" gem "pronto-rubocop", "0.7.0" diff --git a/Gemfile.lock b/Gemfile.lock index f284ba1cc..4aa450298 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -403,7 +403,7 @@ GEM rubocop (~> 0.20) haml (4.0.7) tilt - haml_lint (0.18.1) + haml_lint (0.18.2) haml (~> 4.0) rake (>= 10, < 12) rubocop (>= 0.36.0) @@ -571,7 +571,7 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parser (2.3.1.2) + parser (2.3.1.4) ast (~> 2.2) pg (0.18.4) phantomjs (2.1.1.0) @@ -871,7 +871,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.0) + unicode-display_width (1.1.1) unicorn (5.1.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -954,7 +954,7 @@ DEPENDENCIES guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.2.0) - haml_lint (= 0.18.1) + haml_lint (= 0.18.2) hamlit (= 2.5.0) handlebars_assets (= 0.23.1) http_accept_language (= 2.0.5) From 29bd25f94aaf82a70f6ec19692ff15746bc81934 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 01:38:32 +0200 Subject: [PATCH 06/23] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 977d7e962..3ddc7c68e 100644 --- a/Gemfile +++ b/Gemfile @@ -176,7 +176,7 @@ gem "typhoeus", "1.1.0" # Views gem "gon", "6.1.0" -gem "hamlit", "2.5.0" +gem "hamlit", "2.7.5" gem "mobile-fu", "1.3.1" gem "will_paginate", "3.1.0" gem "rails-timeago", "2.11.0" diff --git a/Gemfile.lock b/Gemfile.lock index 4aa450298..7efcc0e02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -408,7 +408,7 @@ GEM rake (>= 10, < 12) rubocop (>= 0.36.0) sysexits (~> 1.1) - hamlit (2.5.0) + hamlit (2.7.5) temple (~> 0.7.6) thor tilt @@ -955,7 +955,7 @@ DEPENDENCIES guard-rspec (= 4.7.3) guard-rubocop (= 1.2.0) haml_lint (= 0.18.2) - hamlit (= 2.5.0) + hamlit (= 2.7.5) handlebars_assets (= 0.23.1) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) From 25020c24935a102ffbe6ea4f2a2d718990eb91c1 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 01:41:32 +0200 Subject: [PATCH 07/23] Bump jasmine --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 3ddc7c68e..60ffd81ab 100644 --- a/Gemfile +++ b/Gemfile @@ -300,7 +300,7 @@ group :development, :test do gem "cucumber-rails", "1.4.5", require: false # Jasmine (client side application tests (JS)) - gem "jasmine", "2.4.0" + gem "jasmine", "2.5.1" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" diff --git a/Gemfile.lock b/Gemfile.lock index 7efcc0e02..197205716 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -444,12 +444,12 @@ GEM railties (>= 3.0.0) inflecto (0.0.2) ipaddress (0.8.3) - jasmine (2.4.0) - jasmine-core (~> 2.4) + jasmine (2.5.1) + jasmine-core (>= 2.5.1, < 3.0.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.4.1) + jasmine-core (2.5.2) jasmine-jquery-rails (2.0.3) jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) @@ -959,7 +959,7 @@ DEPENDENCIES handlebars_assets (= 0.23.1) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) - jasmine (= 2.4.0) + jasmine (= 2.5.1) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.1.1) jquery-ui-rails (= 5.0.5) From 9d1a093990a7a5ca7c9e7428a735b88827350d3d Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 01:43:16 +0200 Subject: [PATCH 08/23] Bump jquery --- Gemfile | 4 ++-- Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 60ffd81ab..a8ee2a88e 100644 --- a/Gemfile +++ b/Gemfile @@ -89,13 +89,13 @@ gem "entypo-rails", "3.0.0.pre.rc2" gem "backbone-on-rails", "1.2.0.0" gem "handlebars_assets", "0.23.1" -gem "jquery-rails", "4.1.1" +gem "jquery-rails", "4.2.1" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.1.0" gem "js-routes", "1.2.9" source "https://rails-assets.org" do - gem "rails-assets-jquery", "2.2.1" # Should be kept in sync with jquery-rails + gem "rails-assets-jquery", "2.2.4" # Should be kept in sync with jquery-rails gem "rails-assets-markdown-it", "7.0.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 197205716..fb79fb65f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -451,7 +451,7 @@ GEM rake jasmine-core (2.5.2) jasmine-jquery-rails (2.0.3) - jquery-rails (4.1.1) + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -663,7 +663,7 @@ GEM rails-assets-jasmine (2.4.1) rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine (~> 2) - rails-assets-jquery (2.2.1) + rails-assets-jquery (2.2.4) rails-assets-jquery-colorbox (1.6.4) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen-plugin (0.5.0) @@ -961,7 +961,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 2.5.1) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.1.1) + jquery-rails (= 4.2.1) jquery-ui-rails (= 5.0.5) js-routes (= 1.2.9) js_image_paths (= 0.1.0) @@ -1005,7 +1005,7 @@ DEPENDENCIES rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-highlightjs (= 9.6.0)! rails-assets-jasmine-ajax (= 3.2.0)! - rails-assets-jquery (= 2.2.1)! + rails-assets-jquery (= 2.2.4)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! rails-assets-markdown-it (= 7.0.0)! From de64a2e709e41fab1ec77da4c815dd9ca3753cfc Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 10:59:56 +0200 Subject: [PATCH 09/23] Bump addressable and json-schema --- Gemfile | 4 ++-- Gemfile.lock | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index a8ee2a88e..000b624e7 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem "diaspora_federation-rails", "0.1.4" gem "acts_as_api", "0.4.3" gem "json", "1.8.3" -gem "json-schema", "2.6.2" +gem "json-schema", "2.7.0" # Authentication @@ -167,7 +167,7 @@ gem "acts-as-taggable-on", "3.5.0" # URIs and HTTP -gem "addressable", "2.3.8", require: "addressable/uri" +gem "addressable", "2.4.0", require: "addressable/uri" gem "faraday", "0.9.2" gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" diff --git a/Gemfile.lock b/Gemfile.lock index fb79fb65f..093111977 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,7 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.3.8) + addressable (2.4.0) arel (6.0.3) asset_sync (1.1.0) activemodel @@ -469,8 +469,8 @@ GEM multi_json (>= 1.3) securecompare url_safe_base64 - json-schema (2.6.2) - addressable (~> 2.3.8) + json-schema (2.7.0) + addressable (>= 2.4) json_spec (1.1.4) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) @@ -920,7 +920,7 @@ DEPENDENCIES activerecord-import (= 0.15.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.3) - addressable (= 2.3.8) + addressable (= 2.4.0) asset_sync (= 1.1.0) autoprefixer-rails (= 6.5.1) backbone-on-rails (= 1.2.0.0) @@ -966,7 +966,7 @@ DEPENDENCIES js-routes (= 1.2.9) js_image_paths (= 0.1.0) json (= 1.8.3) - json-schema (= 2.6.2) + json-schema (= 2.7.0) json_spec (= 1.1.4) leaflet-rails (= 0.7.7) logging-rails (= 0.5.0) From 378a039860c0f1d9e733531b55cb77b48da4db07 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:00:43 +0200 Subject: [PATCH 10/23] Bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 000b624e7..eeccda097 100644 --- a/Gemfile +++ b/Gemfile @@ -131,7 +131,7 @@ gem "leaflet-rails", "0.7.7" # Parsing -gem "nokogiri", "1.6.8" +gem "nokogiri", "1.6.8.1" gem "redcarpet", "3.3.4" gem "twitter-text", "1.14.0" gem "ruby-oembed", "0.10.1" diff --git a/Gemfile.lock b/Gemfile.lock index 093111977..ac87231a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -522,9 +522,8 @@ GEM nenv (0.3.0) nested_form (0.3.2) nio4r (1.2.1) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -575,7 +574,6 @@ GEM ast (~> 2.2) pg (0.18.4) phantomjs (2.1.1.0) - pkg-config (1.1.7) poltergeist (1.10.0) capybara (~> 2.1) cliver (~> 0.3.1) @@ -975,7 +973,7 @@ DEPENDENCIES minitest mobile-fu (= 1.3.1) mysql2 (= 0.4.4) - nokogiri (= 1.6.8) + nokogiri (= 1.6.8.1) omniauth (= 1.3.1) omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) From ec564fbee1a2d33af16fc313e96002fa2e91f5b3 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:01:25 +0200 Subject: [PATCH 11/23] Bump pg --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index eeccda097..29c85b5b8 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ group :mysql, optional: true do gem "mysql2", "0.4.4" end group :postgresql, optional: true do - gem "pg", "0.18.4" + gem "pg", "0.19.0" end diff --git a/Gemfile.lock b/Gemfile.lock index ac87231a9..a210d96c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -572,7 +572,7 @@ GEM orm_adapter (0.5.0) parser (2.3.1.4) ast (~> 2.2) - pg (0.18.4) + pg (0.19.0) phantomjs (2.1.1.0) poltergeist (1.10.0) capybara (~> 2.1) @@ -981,7 +981,7 @@ DEPENDENCIES omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.1) openid_connect (= 0.12.0) - pg (= 0.18.4) + pg (= 0.19.0) poltergeist (= 1.10.0) pronto (= 0.7.0) pronto-eslint (= 0.7.0) From 42f1bf2c2de1b5538b4bf1407c21680c0814ac68 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:02:22 +0200 Subject: [PATCH 12/23] Bump poltergeist --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 29c85b5b8..5005feb70 100644 --- a/Gemfile +++ b/Gemfile @@ -274,7 +274,7 @@ group :test do gem "capybara", "2.10.1" gem "database_cleaner", "1.5.3" - gem "poltergeist", "1.10.0" + gem "poltergeist", "1.11.0" gem "cucumber-api-steps", "0.13", require: false gem "json_spec", "1.1.4" diff --git a/Gemfile.lock b/Gemfile.lock index a210d96c0..a126fc2c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -574,7 +574,7 @@ GEM ast (~> 2.2) pg (0.19.0) phantomjs (2.1.1.0) - poltergeist (1.10.0) + poltergeist (1.11.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -982,7 +982,7 @@ DEPENDENCIES open_graph_reader (= 0.6.1) openid_connect (= 0.12.0) pg (= 0.19.0) - poltergeist (= 1.10.0) + poltergeist (= 1.11.0) pronto (= 0.7.0) pronto-eslint (= 0.7.0) pronto-haml (= 0.7.0) From f4b02dc64485516b9d6ccf1f9a2b07d429aa669d Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:03:09 +0200 Subject: [PATCH 13/23] Bump pronto --- Gemfile | 2 +- Gemfile.lock | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 5005feb70..669feeeed 100644 --- a/Gemfile +++ b/Gemfile @@ -241,7 +241,7 @@ group :development do # Linters gem "rubocop", "0.40.0" gem "haml_lint", "0.18.2" - gem "pronto", "0.7.0" + gem "pronto", "0.7.1" gem "pronto-eslint", "0.7.0" gem "pronto-rubocop", "0.7.0" gem "pronto-haml", "0.7.0" diff --git a/Gemfile.lock b/Gemfile.lock index a126fc2c2..46ee5dbea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -370,8 +370,8 @@ GEM ruby-progressbar (~> 1.4) get_process_mem (0.2.1) gherkin (4.0.0) - gitlab (3.6.1) - httparty + gitlab (3.7.0) + httparty (~> 0.13.0) terminal-table globalid (0.3.7) activesupport (>= 4.1.0) @@ -579,7 +579,7 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - pronto (0.7.0) + pronto (0.7.1) gitlab (~> 3.6, >= 3.4.0) httparty (~> 0.13.7) octokit (~> 4.3, >= 4.1.0) @@ -835,7 +835,8 @@ GEM temple (0.7.7) term-ansicolor (1.3.2) tins (~> 1.0) - terminal-table (1.6.0) + terminal-table (1.7.3) + unicode-display_width (~> 1.1.1) test_after_commit (1.1.0) activerecord (>= 3.2) thor (0.19.1) @@ -983,7 +984,7 @@ DEPENDENCIES openid_connect (= 0.12.0) pg (= 0.19.0) poltergeist (= 1.11.0) - pronto (= 0.7.0) + pronto (= 0.7.1) pronto-eslint (= 0.7.0) pronto-haml (= 0.7.0) pronto-rubocop (= 0.7.0) From 885ebec5d6e771020f7e458c48fb6b4cf671ceb2 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:03:57 +0200 Subject: [PATCH 14/23] Bump highlightjs --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 669feeeed..c094f15b0 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,7 @@ source "https://rails-assets.org" do gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1" gem "rails-assets-markdown-it-sub", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0" - gem "rails-assets-highlightjs", "9.6.0" + gem "rails-assets-highlightjs", "9.7.0" gem "rails-assets-bootstrap-markdown", "2.10.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 46ee5dbea..fff4919fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -657,7 +657,7 @@ GEM rails-assets-jquery.ui (~> 1.11.4) rails-assets-emojione (2.0.1) rails-assets-favico.js (0.3.10) - rails-assets-highlightjs (9.6.0) + rails-assets-highlightjs (9.7.0) rails-assets-jasmine (2.4.1) rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine (~> 2) @@ -1002,7 +1002,7 @@ DEPENDENCIES rails-assets-blueimp-gallery (= 2.21.3)! rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! - rails-assets-highlightjs (= 9.6.0)! + rails-assets-highlightjs (= 9.7.0)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jquery (= 2.2.4)! rails-assets-jquery-placeholder (= 2.3.1)! From e969dcd8af66f638798f24348223f16c95f40c35 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:04:50 +0200 Subject: [PATCH 15/23] Bump markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c094f15b0..d408b8dd5 100644 --- a/Gemfile +++ b/Gemfile @@ -97,7 +97,7 @@ gem "js-routes", "1.2.9" source "https://rails-assets.org" do gem "rails-assets-jquery", "2.2.4" # Should be kept in sync with jquery-rails - gem "rails-assets-markdown-it", "7.0.0" + gem "rails-assets-markdown-it", "8.0.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "1.0.0" gem "rails-assets-markdown-it-sanitizer", "0.4.2" diff --git a/Gemfile.lock b/Gemfile.lock index fff4919fb..15ed87850 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -673,7 +673,7 @@ GEM rails-assets-jquery.ui (1.11.4) rails-assets-jquery (>= 1.6) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) - rails-assets-markdown-it (7.0.0) + rails-assets-markdown-it (8.0.0) rails-assets-markdown-it-diaspora-mention (1.0.0) rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-sanitizer (0.4.2) @@ -1007,7 +1007,7 @@ DEPENDENCIES rails-assets-jquery (= 2.2.4)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! - rails-assets-markdown-it (= 7.0.0)! + rails-assets-markdown-it (= 8.0.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 1.0.0)! rails-assets-markdown-it-hashtag (= 0.4.0)! From 5920f8f190863ff44a0bcd023bdfe886b3422ad8 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:05:40 +0200 Subject: [PATCH 16/23] Bump markdown-it-sanitizer --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d408b8dd5..d0b1902af 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ source "https://rails-assets.org" do gem "rails-assets-markdown-it", "8.0.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "1.0.0" - gem "rails-assets-markdown-it-sanitizer", "0.4.2" + gem "rails-assets-markdown-it-sanitizer", "0.4.3" gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1" gem "rails-assets-markdown-it-sub", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index 15ed87850..615c1cc2c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -676,7 +676,7 @@ GEM rails-assets-markdown-it (8.0.0) rails-assets-markdown-it-diaspora-mention (1.0.0) rails-assets-markdown-it-hashtag (0.4.0) - rails-assets-markdown-it-sanitizer (0.4.2) + rails-assets-markdown-it-sanitizer (0.4.3) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) rails-assets-perfect-scrollbar (0.6.12) @@ -1011,7 +1011,7 @@ DEPENDENCIES rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 1.0.0)! rails-assets-markdown-it-hashtag (= 0.4.0)! - rails-assets-markdown-it-sanitizer (= 0.4.2)! + rails-assets-markdown-it-sanitizer (= 0.4.3)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-perfect-scrollbar (= 0.6.12)! From bcc260664d55c373e83c31a7a7077307cb291f7f Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:06:38 +0200 Subject: [PATCH 17/23] Bump responders --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d0b1902af..14381f782 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem "rails", "4.2.7.1" # Legacy Rails features, remove me! # responders (class level) -gem "responders", "2.2.0" +gem "responders", "2.3.0" # Appserver diff --git a/Gemfile.lock b/Gemfile.lock index 615c1cc2c..d5c19cd4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -729,7 +729,7 @@ GEM redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) request_store (1.3.1) - responders (2.2.0) + responders (2.3.0) railties (>= 4.2.0, < 5.1) rspec (3.5.0) rspec-core (~> 3.5.0) @@ -1021,7 +1021,7 @@ DEPENDENCIES rb-fsevent (= 0.9.7) rb-inotify (= 0.9.7) redcarpet (= 3.3.4) - responders (= 2.2.0) + responders (= 2.3.0) rspec-rails (= 3.5.1) rubocop (= 0.40.0) ruby-oembed (= 0.10.1) From c79b8624906205ce849bd5eb91185af5770126f6 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:07:29 +0200 Subject: [PATCH 18/23] Bump rspec-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 14381f782..4041f02e4 100644 --- a/Gemfile +++ b/Gemfile @@ -294,7 +294,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.5.1" + gem "rspec-rails", "3.5.2" # Cucumber (integration tests) gem "cucumber-rails", "1.4.5", require: false diff --git a/Gemfile.lock b/Gemfile.lock index d5c19cd4a..c51986c53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -743,7 +743,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -1022,7 +1022,7 @@ DEPENDENCIES rb-inotify (= 0.9.7) redcarpet (= 3.3.4) responders (= 2.3.0) - rspec-rails (= 3.5.1) + rspec-rails (= 3.5.2) rubocop (= 0.40.0) ruby-oembed (= 0.10.1) rubyzip (= 1.2.0) From 1bd60ec39c99cd35f565f3dc4a85261b0a4e12cd Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:09:23 +0200 Subject: [PATCH 19/23] Bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 4041f02e4..447b27e5f 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem "simple_captcha2", "0.4.0", require: "simple_captcha" # Background processing -gem "sidekiq", "4.1.4" +gem "sidekiq", "4.2.2" gem "sinatra", "1.4.7" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index c51986c53..8e2969ebc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -784,11 +784,11 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) - sidekiq (4.1.4) + sidekiq (4.2.2) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) + rack-protection (~> 1.5) redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) sidekiq-cron (0.4.2) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) @@ -1029,7 +1029,7 @@ DEPENDENCIES sass-rails (= 5.0.6) secure_headers (= 3.4.1) shoulda-matchers (= 3.1.1) - sidekiq (= 4.1.4) + sidekiq (= 4.2.2) sidekiq-cron (= 0.4.2) simple_captcha2 (= 0.4.0) simplecov (= 0.12.0) From dd1d07967322dd7068b5ee151ff363aaa444858d Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:10:12 +0200 Subject: [PATCH 20/23] Bump sidekiq-cron --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 447b27e5f..42bdd8e6d 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem "sinatra", "1.4.7" # Scheduled processing -gem "sidekiq-cron", "0.4.2" +gem "sidekiq-cron", "0.4.4" # Compression diff --git a/Gemfile.lock b/Gemfile.lock index 8e2969ebc..271b9f83f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -762,7 +762,7 @@ GEM ruby-progressbar (1.8.1) ruby_dep (1.3.1) rubyzip (1.2.0) - rufus-scheduler (3.2.1) + rufus-scheduler (3.2.2) rugged (0.24.0) safe_yaml (1.0.4) sass (3.4.22) @@ -789,10 +789,10 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (~> 1.5) redis (~> 3.2, >= 3.2.1) - sidekiq-cron (0.4.2) + sidekiq-cron (0.4.4) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) + sidekiq (>= 4.2.1) sigar (0.7.3) simple_captcha2 (0.4.0) rails (>= 4.1) @@ -1030,7 +1030,7 @@ DEPENDENCIES secure_headers (= 3.4.1) shoulda-matchers (= 3.1.1) sidekiq (= 4.2.2) - sidekiq-cron (= 0.4.2) + sidekiq-cron (= 0.4.4) simple_captcha2 (= 0.4.0) simplecov (= 0.12.0) sinatra (= 1.4.7) From 1729aac5d283c0c11b5a44523d5740b40131d005 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:11:12 +0200 Subject: [PATCH 21/23] Bump spring --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 42bdd8e6d..5b7512a50 100644 --- a/Gemfile +++ b/Gemfile @@ -249,7 +249,7 @@ group :development do # Preloading environment - gem "spring", "1.7.2" + gem "spring", "2.0.0" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 271b9f83f..d5a5a751b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -809,7 +809,8 @@ GEM sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) - spring (1.7.2) + spring (2.0.0) + activesupport (>= 4.2) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.4) @@ -1035,7 +1036,7 @@ DEPENDENCIES simplecov (= 0.12.0) sinatra (= 1.4.7) sinon-rails (= 1.15.0) - spring (= 1.7.2) + spring (= 2.0.0) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 1.1.0) From 88c4d1a5197cf70912f43f0edf6de39c91bda187 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:11:54 +0200 Subject: [PATCH 22/23] Bump uglifier --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5b7512a50..699e7e3d1 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ gem "sidekiq-cron", "0.4.4" # Compression -gem "uglifier", "3.0.1" +gem "uglifier", "3.0.2" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index d5a5a751b..873eb0a1c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -866,7 +866,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.1) + uglifier (3.0.2) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -1045,7 +1045,7 @@ DEPENDENCIES twitter (= 5.16.0) twitter-text (= 1.14.0) typhoeus (= 1.1.0) - uglifier (= 3.0.1) + uglifier (= 3.0.2) unicorn (= 5.1.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) From 52bb442ddd798766a333ad88e82335d6646763f7 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 18 Oct 2016 11:12:36 +0200 Subject: [PATCH 23/23] Bump will_paginate closes #7149 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 699e7e3d1..4cd121d5f 100644 --- a/Gemfile +++ b/Gemfile @@ -178,7 +178,7 @@ gem "typhoeus", "1.1.0" gem "gon", "6.1.0" gem "hamlit", "2.7.5" gem "mobile-fu", "1.3.1" -gem "will_paginate", "3.1.0" +gem "will_paginate", "3.1.5" gem "rails-timeago", "2.11.0" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index 873eb0a1c..73647a05c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -906,7 +906,7 @@ GEM websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - will_paginate (3.1.0) + will_paginate (3.1.5) xml-simple (1.1.5) xpath (2.0.0) nokogiri (~> 1.3) @@ -1051,7 +1051,7 @@ DEPENDENCIES uuid (= 2.3.8) versionist (= 1.5.0) webmock (= 2.1.0) - will_paginate (= 3.1.0) + will_paginate (= 3.1.5) BUNDLED WITH 1.13.5