From 00e740bca4cacf45ac564e3427b2e5763b271a08 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 15:45:32 +0100 Subject: [PATCH 01/74] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7fe63279b..465e927ef 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ group :postgresql, optional: true do end -gem "activerecord-import", "0.15.0" +gem "activerecord-import", "0.17.1" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index e58a2c187..a2bb2f5ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,7 @@ GEM activemodel (= 4.2.8) activesupport (= 4.2.8) arel (~> 6.0) - activerecord-import (0.15.0) + activerecord-import (0.17.1) activerecord (>= 3.2) activesupport (4.2.8) i18n (~> 0.7) @@ -786,7 +786,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.5) - activerecord-import (= 0.15.0) + activerecord-import (= 0.17.1) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.3) addressable (= 2.4.0) From e98d9501c44857a733a0972ab467b77abb95c456 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 15:51:58 +0100 Subject: [PATCH 02/74] Bump acts_as_api --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 465e927ef..0a9e73c4a 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "diaspora_federation-rails", "0.1.7" # API and JSON -gem "acts_as_api", "0.4.3" +gem "acts_as_api", "1.0.0" gem "json", "1.8.6" gem "json-schema", "2.7.0" diff --git a/Gemfile.lock b/Gemfile.lock index a2bb2f5ee..6400dc10b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,7 +42,7 @@ GEM tzinfo (~> 1.1) acts-as-taggable-on (3.5.0) activerecord (>= 3.2, < 5) - acts_as_api (0.4.3) + acts_as_api (1.0.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) @@ -788,7 +788,7 @@ DEPENDENCIES active_model_serializers (= 0.9.5) activerecord-import (= 0.17.1) acts-as-taggable-on (= 3.5.0) - acts_as_api (= 0.4.3) + acts_as_api (= 1.0.0) addressable (= 2.4.0) asset_sync (= 2.0.0) autoprefixer-rails (= 6.5.1) From 8356391eb7d0416f9ff72ac0a3e9101018c6fffc Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 15:58:46 +0100 Subject: [PATCH 03/74] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0a9e73c4a..18f3ed878 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,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.5.1" +gem "autoprefixer-rails", "6.7.6" gem "bootstrap-switch-rails", "3.3.3" # Database diff --git a/Gemfile.lock b/Gemfile.lock index 6400dc10b..7825bfcb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM unf ast (2.3.0) attr_required (1.0.1) - autoprefixer-rails (6.5.1) + autoprefixer-rails (6.7.6) execjs bcrypt (3.1.11) bindata (2.3.1) @@ -791,7 +791,7 @@ DEPENDENCIES acts_as_api (= 1.0.0) addressable (= 2.4.0) asset_sync (= 2.0.0) - autoprefixer-rails (= 6.5.1) + autoprefixer-rails (= 6.7.6) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) capybara (= 2.10.1) From c070b35ca9f4d2b2a063f249c41da996cb18db37 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:01:50 +0100 Subject: [PATCH 04/74] Bump eye --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 18f3ed878..747a48098 100644 --- a/Gemfile +++ b/Gemfile @@ -222,7 +222,7 @@ group :production do # we don"t install these on travis to speed up test runs # Process management - gem "eye", "0.8.1" + gem "eye", "0.9.1" # Redirects diff --git a/Gemfile.lock b/Gemfile.lock index 7825bfcb0..527aeab97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -197,11 +197,11 @@ GEM ffi (>= 1.3.0) excon (0.54.0) execjs (2.7.0) - eye (0.8.1) + eye (0.9.1) celluloid (~> 0.17.3) celluloid-io (~> 0.17.0) sigar (~> 0.7.3) - state_machine + state_machines thor factory_girl (4.7.0) activesupport (>= 3.0.0) @@ -392,7 +392,7 @@ GEM naught (1.1.0) nenv (0.3.0) nested_form (0.3.2) - nio4r (1.2.1) + nio4r (2.0.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) notiffany (0.1.1) @@ -693,7 +693,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - state_machine (1.2.0) + state_machines (0.4.0) string-direction (1.2.0) yard (~> 0.8) swd (1.0.1) @@ -715,7 +715,7 @@ GEM thread_safe (0.3.6) tilt (1.4.1) timecop (0.8.1) - timers (4.1.1) + timers (4.1.2) hitimes tins (1.12.0) turbo_dev_assets (0.0.2) @@ -808,7 +808,7 @@ DEPENDENCIES diaspora_federation-rails (= 0.1.7) diaspora_federation-test (= 0.1.7) entypo-rails (= 3.0.0.pre.rc2) - eye (= 0.8.1) + eye (= 0.9.1) factory_girl_rails (= 4.7.0) faraday (= 0.9.2) faraday-cookie_jar (= 0.0.6) From 33aaa0ea802da2bcd8697a5dea57f643aa038fdf Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:13:33 +0100 Subject: [PATCH 05/74] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 747a48098..156ff10ff 100644 --- a/Gemfile +++ b/Gemfile @@ -181,7 +181,7 @@ gem "typhoeus", "1.1.0" # Views gem "gon", "6.1.0" -gem "hamlit", "2.7.5" +gem "hamlit", "2.8.0" gem "mobile-fu", "1.3.1" gem "will_paginate", "3.1.5" gem "rails-timeago", "2.11.0" diff --git a/Gemfile.lock b/Gemfile.lock index 527aeab97..d25031de3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,8 +280,8 @@ GEM rake (>= 10, < 12) rubocop (>= 0.36.0) sysexits (~> 1.1) - hamlit (2.7.5) - temple (~> 0.7.6) + hamlit (2.8.0) + temple (>= 0.8.0) thor tilt handlebars_assets (0.23.1) @@ -704,7 +704,7 @@ GEM json (>= 1.4.3) sysexits (1.2.0) systemu (2.6.5) - temple (0.7.7) + temple (0.8.0) term-ansicolor (1.3.2) tins (~> 1.0) terminal-table (1.7.3) @@ -822,7 +822,7 @@ DEPENDENCIES guard-rspec (= 4.7.3) guard-rubocop (= 1.2.0) haml_lint (= 0.18.2) - hamlit (= 2.7.5) + hamlit (= 2.8.0) handlebars_assets (= 0.23.1) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) From 7033c061a1e592fb5bbc2107b18a4cae7811eca1 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:15:47 +0100 Subject: [PATCH 06/74] Bump http_accept_language --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 156ff10ff..538cdd672 100644 --- a/Gemfile +++ b/Gemfile @@ -119,7 +119,7 @@ end # Localization -gem "http_accept_language", "2.0.5" +gem "http_accept_language", "2.1.0" gem "i18n-inflector-rails", "1.0.7" gem "rails-i18n", "4.0.8" diff --git a/Gemfile.lock b/Gemfile.lock index d25031de3..26a0fa491 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -301,7 +301,7 @@ GEM http-cookie (1.0.2) domain_name (~> 0.5) http-form_data (1.0.1) - http_accept_language (2.0.5) + http_accept_language (2.1.0) http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) @@ -824,7 +824,7 @@ DEPENDENCIES haml_lint (= 0.18.2) hamlit (= 2.8.0) handlebars_assets (= 0.23.1) - http_accept_language (= 2.0.5) + http_accept_language (= 2.1.0) i18n-inflector-rails (= 1.0.7) jasmine (= 2.5.1) jasmine-jquery-rails (= 2.0.3) From cd09b64c8f772964daf47d682717a86a17a30894 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:26:13 +0100 Subject: [PATCH 07/74] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 538cdd672..a09b8bf24 100644 --- a/Gemfile +++ b/Gemfile @@ -89,7 +89,7 @@ gem "handlebars_assets", "0.23.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" +gem "js-routes", "1.3.3" source "https://rails-assets.org" do gem "rails-assets-jquery", "2.2.4" # Should be kept in sync with jquery-rails diff --git a/Gemfile.lock b/Gemfile.lock index 26a0fa491..895d055a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -328,7 +328,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.2.9) + js-routes (1.3.3) railties (>= 3.2) sprockets-rails js_image_paths (0.1.0) @@ -830,7 +830,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.2.1) jquery-ui-rails (= 5.0.5) - js-routes (= 1.2.9) + js-routes (= 1.3.3) js_image_paths (= 0.1.0) json (= 1.8.6) json-schema (= 2.7.0) From e25c5c9b98f8468a62532c92b489186c953ff787 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:29:37 +0100 Subject: [PATCH 08/74] Bump json-schema --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a09b8bf24..e6ba91a54 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem "diaspora_federation-rails", "0.1.7" gem "acts_as_api", "1.0.0" gem "json", "1.8.6" -gem "json-schema", "2.7.0" +gem "json-schema", "2.8.0" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index 895d055a6..169128e5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,7 +340,7 @@ GEM multi_json (>= 1.3) securecompare url_safe_base64 - json-schema (2.7.0) + json-schema (2.8.0) addressable (>= 2.4) json_spec (1.1.4) multi_json (~> 1.0) @@ -833,7 +833,7 @@ DEPENDENCIES js-routes (= 1.3.3) js_image_paths (= 0.1.0) json (= 1.8.6) - json-schema (= 2.7.0) + json-schema (= 2.8.0) json_spec (= 1.1.4) leaflet-rails (= 0.7.7) logging-rails (= 0.5.0) From 25b9f3f74ff67f8eb5dfa18a0128c7ea8ed52b7a Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:38:40 +0100 Subject: [PATCH 09/74] Bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e6ba91a54..e515093c5 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,7 @@ gem "activerecord-import", "0.17.1" gem "fog-aws", "1.2.0" gem "carrierwave", "0.11.2" -gem "mini_magick", "4.5.1" +gem "mini_magick", "4.6.1" # GUID generation gem "uuid", "2.3.8" diff --git a/Gemfile.lock b/Gemfile.lock index 169128e5f..8a7c23b1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -378,7 +378,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.1) - mini_magick (4.5.1) + mini_magick (4.6.1) mini_portile2 (2.1.0) minitest (5.10.1) mobile-fu (1.3.1) @@ -838,7 +838,7 @@ DEPENDENCIES leaflet-rails (= 0.7.7) logging-rails (= 0.5.0) markerb (= 1.1.0) - mini_magick (= 4.5.1) + mini_magick (= 4.6.1) minitest mobile-fu (= 1.3.1) mysql2 (= 0.4.4) From bed5e281efe80e2a357505180e1c69f631f8c444 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:41:11 +0100 Subject: [PATCH 10/74] Bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e515093c5..0ee74aff0 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem "bootstrap-switch-rails", "3.3.3" # Database group :mysql, optional: true do - gem "mysql2", "0.4.4" + gem "mysql2", "0.4.5" end group :postgresql, optional: true do gem "pg", "0.19.0" diff --git a/Gemfile.lock b/Gemfile.lock index 8a7c23b1a..a468c0840 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -388,7 +388,7 @@ GEM multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.4.4) + mysql2 (0.4.5) naught (1.1.0) nenv (0.3.0) nested_form (0.3.2) @@ -841,7 +841,7 @@ DEPENDENCIES mini_magick (= 4.6.1) minitest mobile-fu (= 1.3.1) - mysql2 (= 0.4.4) + mysql2 (= 0.4.5) nokogiri (= 1.6.8.1) omniauth (= 1.3.1) omniauth-facebook (= 4.0.0) From 51e5f8cf1e69b6d8c9c9869c6656943452bb8d7d Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:44:14 +0100 Subject: [PATCH 11/74] Bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0ee74aff0..8c41f521e 100644 --- a/Gemfile +++ b/Gemfile @@ -132,7 +132,7 @@ gem "leaflet-rails", "0.7.7" # Parsing -gem "nokogiri", "1.6.8.1" +gem "nokogiri", "1.7.0.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 a468c0840..0f78e1ad6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM nenv (0.3.0) nested_form (0.3.2) nio4r (2.0.0) - nokogiri (1.6.8.1) + nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) notiffany (0.1.1) nenv (~> 0.1) @@ -842,7 +842,7 @@ DEPENDENCIES minitest mobile-fu (= 1.3.1) mysql2 (= 0.4.5) - nokogiri (= 1.6.8.1) + nokogiri (= 1.7.0.1) omniauth (= 1.3.1) omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) From 886dddca506c2a03595ea7906844da9170e6d974 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:48:05 +0100 Subject: [PATCH 12/74] Bump omniauth 1.5.0 would require Ruby >= 2.1.9 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 8c41f521e..2963ae4ee 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ gem "secure_headers", "3.5.0" # Services -gem "omniauth", "1.3.1" +gem "omniauth", "1.4.2" gem "omniauth-facebook", "4.0.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 0f78e1ad6..a7f9c1236 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,7 +290,7 @@ GEM sprockets (>= 2.0.0) tilt (>= 1.2) hashdiff (0.3.2) - hashie (3.4.4) + hashie (3.5.5) hike (1.2.3) hitimes (1.2.4) http (1.0.4) @@ -407,7 +407,7 @@ GEM rack (>= 1.2, < 3) octokit (4.3.0) sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) + omniauth (1.4.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) omniauth-facebook (4.0.0) @@ -843,7 +843,7 @@ DEPENDENCIES mobile-fu (= 1.3.1) mysql2 (= 0.4.5) nokogiri (= 1.7.0.1) - omniauth (= 1.3.1) + omniauth (= 1.4.2) omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.2.1) From dbf91a0b1da812cf2878029b74e3abd6ff7b1545 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 16:50:40 +0100 Subject: [PATCH 13/74] Bump omniauth-twitter --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 2963ae4ee..67fe18ca1 100644 --- a/Gemfile +++ b/Gemfile @@ -151,7 +151,7 @@ gem "secure_headers", "3.5.0" gem "omniauth", "1.4.2" gem "omniauth-facebook", "4.0.0" gem "omniauth-tumblr", "1.2" -gem "omniauth-twitter", "1.2.1" +gem "omniauth-twitter", "1.4.0" gem "twitter", "5.16.0" gem "omniauth-wordpress", "0.2.2" diff --git a/Gemfile.lock b/Gemfile.lock index a7f9c1236..1826428d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,9 +421,9 @@ GEM omniauth-tumblr (1.2) multi_json omniauth-oauth (~> 1.0) - omniauth-twitter (1.2.1) - json (~> 1.3) + omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) + rack omniauth-wordpress (0.2.2) omniauth-oauth2 (>= 1.1.0) open_graph_reader (0.6.1) @@ -846,7 +846,7 @@ DEPENDENCIES omniauth (= 1.4.2) omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) - omniauth-twitter (= 1.2.1) + omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.1) openid_connect (= 0.12.0) From d6f8a21706a089891b66506bff480740fae4c122 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:09:53 +0100 Subject: [PATCH 14/74] Bump rack-cors --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 67fe18ca1..3ff2ba131 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem "configurate", "0.3.1" # Cross-origin resource sharing -gem "rack-cors", "0.4.0", require: "rack/cors" +gem "rack-cors", "0.4.1", require: "rack/cors" # CSS diff --git a/Gemfile.lock b/Gemfile.lock index 1826428d5..9dfced14c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -479,7 +479,7 @@ GEM quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.5) - rack-cors (0.4.0) + rack-cors (0.4.1) rack-google-analytics (1.2.0) actionpack activesupport @@ -860,7 +860,7 @@ DEPENDENCIES pry pry-byebug quiet_assets (= 1.1.0) - rack-cors (= 0.4.0) + rack-cors (= 0.4.1) rack-google-analytics (= 1.2.0) rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) From 704fa9921b8d77f70d08835db55550e02bc2c217 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:11:08 +0100 Subject: [PATCH 15/74] Bump redcarpet --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3ff2ba131..9db05a383 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,7 @@ gem "leaflet-rails", "0.7.7" # Parsing gem "nokogiri", "1.7.0.1" -gem "redcarpet", "3.3.4" +gem "redcarpet", "3.4.0" gem "twitter-text", "1.14.0" gem "ruby-oembed", "0.10.1" gem "open_graph_reader", "0.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index 9dfced14c..f541f2375 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -596,7 +596,7 @@ GEM rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) - redcarpet (3.3.4) + redcarpet (3.4.0) redis (3.3.1) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) @@ -891,7 +891,7 @@ DEPENDENCIES rails_admin (= 0.8.1) rb-fsevent (= 0.9.7) rb-inotify (= 0.9.7) - redcarpet (= 3.3.4) + redcarpet (= 3.4.0) responders (= 2.3.0) rspec-rails (= 3.5.2) rubocop (= 0.40.0) From 8897d392168e7a042cf7937aabb9f3ed4b00ad7e Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:12:51 +0100 Subject: [PATCH 16/74] Bump rubyzip --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9db05a383..4615754a2 100644 --- a/Gemfile +++ b/Gemfile @@ -192,7 +192,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails" # Reading and writing zip files -gem "rubyzip", "1.2.0", require: "zip" +gem "rubyzip", "1.2.1", require: "zip" # Prevent occasions where minitest is not bundled in # packaged versions of ruby. See following issues/prs: diff --git a/Gemfile.lock b/Gemfile.lock index f541f2375..f61e1a009 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -634,7 +634,7 @@ GEM ruby-oembed (0.10.1) ruby-progressbar (1.8.1) ruby_dep (1.3.1) - rubyzip (1.2.0) + rubyzip (1.2.1) rufus-scheduler (3.2.2) rugged (0.24.0) safe_yaml (1.0.4) @@ -896,7 +896,7 @@ DEPENDENCIES rspec-rails (= 3.5.2) rubocop (= 0.40.0) ruby-oembed (= 0.10.1) - rubyzip (= 1.2.0) + rubyzip (= 1.2.1) sass-rails (= 5.0.6) secure_headers (= 3.5.0) shoulda-matchers (= 3.1.1) From 2c9dccbb9a581e16fba55961ac6d7a2c97a4eba2 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:14:10 +0100 Subject: [PATCH 17/74] Bump secure_headers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4615754a2..e86bb52ff 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ gem "string-direction", "1.2.0" # Security Headers -gem "secure_headers", "3.5.0" +gem "secure_headers", "3.6.1" # Services diff --git a/Gemfile.lock b/Gemfile.lock index f61e1a009..9d99851e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -651,7 +651,7 @@ GEM scss_lint (0.49.0) rake (>= 0.9, < 12) sass (~> 3.4.20) - secure_headers (3.5.0) + secure_headers (3.6.1) useragent securecompare (1.0.0) shellany (0.0.1) @@ -898,7 +898,7 @@ DEPENDENCIES ruby-oembed (= 0.10.1) rubyzip (= 1.2.1) sass-rails (= 5.0.6) - secure_headers (= 3.5.0) + secure_headers (= 3.6.1) shoulda-matchers (= 3.1.1) sidekiq (= 4.2.2) sidekiq-cron (= 0.4.4) From 09688fad44e21a05be4a9226abe3b8e2f4dc3266 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:17:40 +0100 Subject: [PATCH 18/74] Bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index e86bb52ff..48b6470a2 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem "simple_captcha2", "0.4.0", require: "simple_captcha" # Background processing -gem "sidekiq", "4.2.2" +gem "sidekiq", "4.2.9" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index 9d99851e8..961051915 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,9 +126,9 @@ GEM compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 2.13) - concurrent-ruby (1.0.2) + concurrent-ruby (1.0.5) configurate (0.3.1) - connection_pool (2.2.0) + connection_pool (2.2.1) coveralls (0.8.15) json (>= 1.8, < 3) simplecov (~> 0.12.0) @@ -597,7 +597,7 @@ GEM rb-inotify (0.9.7) ffi (>= 0.5.0) redcarpet (3.4.0) - redis (3.3.1) + redis (3.3.3) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) @@ -657,10 +657,10 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) - sidekiq (4.2.2) + sidekiq (4.2.9) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) - rack-protection (~> 1.5) + rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) sidekiq-cron (0.4.4) redis-namespace (>= 1.5.2) @@ -900,7 +900,7 @@ DEPENDENCIES sass-rails (= 5.0.6) secure_headers (= 3.6.1) shoulda-matchers (= 3.1.1) - sidekiq (= 4.2.2) + sidekiq (= 4.2.9) sidekiq-cron (= 0.4.4) simple_captcha2 (= 0.4.0) simplecov (= 0.12.0) From 14728e38179130283833d3a7dd1f891a4f47c1af Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:19:40 +0100 Subject: [PATCH 19/74] Bump sidekiq-cron --- Gemfile | 2 +- Gemfile.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 48b6470a2..979606871 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ gem "sidekiq", "4.2.9" # Scheduled processing -gem "sidekiq-cron", "0.4.4" +gem "sidekiq-cron", "0.4.5" # Compression diff --git a/Gemfile.lock b/Gemfile.lock index 961051915..76b23855d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -598,7 +598,7 @@ GEM ffi (>= 0.5.0) redcarpet (3.4.0) redis (3.3.3) - redis-namespace (1.5.2) + redis-namespace (1.5.3) redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) request_store (1.3.1) @@ -635,7 +635,8 @@ GEM ruby-progressbar (1.8.1) ruby_dep (1.3.1) rubyzip (1.2.1) - rufus-scheduler (3.2.2) + rufus-scheduler (3.3.4) + tzinfo rugged (0.24.0) safe_yaml (1.0.4) sass (3.4.22) @@ -662,7 +663,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) - sidekiq-cron (0.4.4) + sidekiq-cron (0.4.5) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.2.1) @@ -901,7 +902,7 @@ DEPENDENCIES secure_headers (= 3.6.1) shoulda-matchers (= 3.1.1) sidekiq (= 4.2.9) - sidekiq-cron (= 0.4.4) + sidekiq-cron (= 0.4.5) simple_captcha2 (= 0.4.0) simplecov (= 0.12.0) sinon-rails (= 1.15.0) From c0c8793df32187f88ad35b0d211ef3452de34274 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:24:57 +0100 Subject: [PATCH 20/74] Bump simple_captcha2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 979606871..617c30c98 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem "devise_lastseenable", "0.0.6" # Captcha -gem "simple_captcha2", "0.4.0", require: "simple_captcha" +gem "simple_captcha2", "0.4.3", require: "simple_captcha" # Background processing diff --git a/Gemfile.lock b/Gemfile.lock index 76b23855d..e2b919c3e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -668,7 +668,7 @@ GEM rufus-scheduler (>= 2.0.24) sidekiq (>= 4.2.1) sigar (0.7.3) - simple_captcha2 (0.4.0) + simple_captcha2 (0.4.3) rails (>= 4.1) simple_oauth (0.3.1) simplecov (0.12.0) @@ -903,7 +903,7 @@ DEPENDENCIES shoulda-matchers (= 3.1.1) sidekiq (= 4.2.9) sidekiq-cron (= 0.4.5) - simple_captcha2 (= 0.4.0) + simple_captcha2 (= 0.4.3) simplecov (= 0.12.0) sinon-rails (= 1.15.0) spring (= 2.0.0) From 9bf3a785929c33a30ff7c5a4e1f4e0a9c62274a3 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:29:36 +0100 Subject: [PATCH 21/74] Bump twitter-text --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 617c30c98..63680e2c2 100644 --- a/Gemfile +++ b/Gemfile @@ -134,7 +134,7 @@ gem "leaflet-rails", "0.7.7" gem "nokogiri", "1.7.0.1" gem "redcarpet", "3.4.0" -gem "twitter-text", "1.14.0" +gem "twitter-text", "1.14.5" gem "ruby-oembed", "0.10.1" gem "open_graph_reader", "0.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index e2b919c3e..560bd614a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -731,7 +731,7 @@ GEM memoizable (~> 0.4.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - twitter-text (1.14.0) + twitter-text (1.14.5) unf (~> 0.1.0) typhoeus (1.1.0) ethon (>= 0.9.0) @@ -914,7 +914,7 @@ DEPENDENCIES timecop (= 0.8.1) turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) - twitter-text (= 1.14.0) + twitter-text (= 1.14.5) typhoeus (= 1.1.0) uglifier (= 3.0.2) unicorn (= 5.1.0) From 3f23ef7e315787afbcd05d3a03c7a64d7e7e6998 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:33:09 +0100 Subject: [PATCH 22/74] Bump typhoeus --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 63680e2c2..0cf31d31b 100644 --- a/Gemfile +++ b/Gemfile @@ -176,7 +176,7 @@ 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" -gem "typhoeus", "1.1.0" +gem "typhoeus", "1.1.2" # Views diff --git a/Gemfile.lock b/Gemfile.lock index 560bd614a..ab292a7a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) - ffi (1.9.14) + ffi (1.9.17) fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) @@ -733,7 +733,7 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.14.5) unf (~> 0.1.0) - typhoeus (1.1.0) + typhoeus (1.1.2) ethon (>= 0.9.0) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -915,7 +915,7 @@ DEPENDENCIES turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) twitter-text (= 1.14.5) - typhoeus (= 1.1.0) + typhoeus (= 1.1.2) uglifier (= 3.0.2) unicorn (= 5.1.0) unicorn-worker-killer (= 0.4.4) From 41321a2fa6255b95b082987e9d643dc05e9cea03 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:36:57 +0100 Subject: [PATCH 23/74] Bump uglifier --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0cf31d31b..c151dbd72 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem "sidekiq-cron", "0.4.5" # Compression -gem "uglifier", "3.0.2" +gem "uglifier", "3.1.2" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index ab292a7a9..7451e95d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -737,7 +737,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.2) + uglifier (3.1.2) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -916,7 +916,7 @@ DEPENDENCIES twitter (= 5.16.0) twitter-text (= 1.14.5) typhoeus (= 1.1.2) - uglifier (= 3.0.2) + uglifier (= 3.1.2) unicorn (= 5.1.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) From c92a0785163dd122fe25b1fd918ad303d468b0f0 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:39:15 +0100 Subject: [PATCH 24/74] Bump unicorn --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index c151dbd72..137f334d4 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem "responders", "2.3.0" # Appserver -gem "unicorn", "5.1.0", require: false +gem "unicorn", "5.2.0", require: false gem "unicorn-worker-killer", "0.4.4" # Federation diff --git a/Gemfile.lock b/Gemfile.lock index 7451e95d7..f8029d01a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -351,7 +351,7 @@ GEM kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.10.0) + kgio (2.11.0) leaflet-rails (0.7.7) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -591,7 +591,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.16.0) + raindrops (0.17.0) rake (11.3.0) rb-fsevent (0.9.7) rb-inotify (0.9.7) @@ -743,7 +743,7 @@ GEM unf_ext unf_ext (0.0.7.2) unicode-display_width (1.1.1) - unicorn (5.1.0) + unicorn (5.2.0) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -917,7 +917,7 @@ DEPENDENCIES twitter-text (= 1.14.5) typhoeus (= 1.1.2) uglifier (= 3.1.2) - unicorn (= 5.1.0) + unicorn (= 5.2.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) versionist (= 1.5.0) From 1d88e48df1a8168b535b8dcc1d19b04318718bd9 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:43:16 +0100 Subject: [PATCH 25/74] Bump capybara --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 137f334d4..fd282c112 100644 --- a/Gemfile +++ b/Gemfile @@ -277,7 +277,7 @@ group :test do # Cucumber (integration tests) - gem "capybara", "2.10.1" + gem "capybara", "2.12.1" gem "database_cleaner", "1.5.3" gem "poltergeist", "1.11.0" diff --git a/Gemfile.lock b/Gemfile.lock index f8029d01a..197be08b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM buftok (0.2.0) builder (3.2.3) byebug (9.0.5) - capybara (2.10.1) + capybara (2.12.1) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -795,7 +795,7 @@ DEPENDENCIES autoprefixer-rails (= 6.7.6) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) - capybara (= 2.10.1) + capybara (= 2.12.1) carrierwave (= 0.11.2) compass-rails (= 2.0.5) configurate (= 0.3.1) From 408461d18662ed07a7034629d5c706dafadae251 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:45:04 +0100 Subject: [PATCH 26/74] Bump coveralls --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 197be08b8..329211eae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,12 +129,12 @@ GEM concurrent-ruby (1.0.5) configurate (0.3.1) connection_pool (2.2.1) - coveralls (0.8.15) + coveralls (0.8.19) json (>= 1.8, < 3) simplecov (~> 0.12.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - tins (>= 1.6.0, < 2) + tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) cucumber (2.4.0) @@ -706,7 +706,7 @@ GEM sysexits (1.2.0) systemu (2.6.5) temple (0.8.0) - term-ansicolor (1.3.2) + term-ansicolor (1.4.0) tins (~> 1.0) terminal-table (1.7.3) unicode-display_width (~> 1.1.1) @@ -718,7 +718,7 @@ GEM timecop (0.8.1) timers (4.1.2) hitimes - tins (1.12.0) + tins (1.13.2) turbo_dev_assets (0.0.2) twitter (5.16.0) addressable (~> 2.3) From 2b1da9463aa97d9b41c6c9b5faadb6d8a2bdf8de Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:49:01 +0100 Subject: [PATCH 27/74] Bump factory_girl_rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index fd282c112..a96bf6a97 100644 --- a/Gemfile +++ b/Gemfile @@ -286,7 +286,7 @@ group :test do # General helpers - gem "factory_girl_rails", "4.7.0" + gem "factory_girl_rails", "4.8.0" gem "timecop", "0.8.1" gem "webmock", "2.3.2", require: false gem "shoulda-matchers", "3.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 329211eae..3ddcbc3dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,10 +203,10 @@ GEM sigar (~> 0.7.3) state_machines thor - factory_girl (4.7.0) + factory_girl (4.8.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.8.0) + factory_girl (~> 4.8.0) railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -810,7 +810,7 @@ DEPENDENCIES diaspora_federation-test (= 0.1.7) entypo-rails (= 3.0.0.pre.rc2) eye (= 0.9.1) - factory_girl_rails (= 4.7.0) + factory_girl_rails (= 4.8.0) faraday (= 0.9.2) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) From c503ed70565ca0e1a6fb745c04b8f0635c88c2be Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:50:43 +0100 Subject: [PATCH 28/74] Bump guard --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index a96bf6a97..99d918d82 100644 --- a/Gemfile +++ b/Gemfile @@ -236,7 +236,7 @@ end group :development do # Automatic test runs - gem "guard", "2.14.0", require: false + gem "guard", "2.14.1", require: false gem "guard-cucumber", "2.1.2", require: false gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.2.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3ddcbc3dc..69ff64fa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -252,7 +252,7 @@ GEM json multi_json request_store (>= 1.0) - guard (2.14.0) + guard (2.14.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (~> 1.0) @@ -365,7 +365,7 @@ GEM logging (>= 1.8) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.10) + lumberjack (1.0.11) macaddr (1.7.1) systemu (~> 2.6.2) mail (2.6.4) @@ -633,7 +633,7 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) ruby-oembed (0.10.1) ruby-progressbar (1.8.1) - ruby_dep (1.3.1) + ruby_dep (1.5.0) rubyzip (1.2.1) rufus-scheduler (3.3.4) tzinfo @@ -818,7 +818,7 @@ DEPENDENCIES fog-aws (= 1.2.0) fuubar (= 2.2.0) gon (= 6.1.0) - guard (= 2.14.0) + guard (= 2.14.1) guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.2.0) From e736a73759a9fb84461357b48678eeaa4cb79a26 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:54:24 +0100 Subject: [PATCH 29/74] Bump jasmine --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 99d918d82..9db268553 100644 --- a/Gemfile +++ b/Gemfile @@ -305,7 +305,7 @@ group :development, :test do gem "cucumber-rails", "1.4.5", require: false # Jasmine (client side application tests (JS)) - gem "jasmine", "2.5.1" + gem "jasmine", "2.5.2" 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 69ff64fa3..e13379c77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -315,7 +315,7 @@ GEM i18n-inflector (~> 2.6) railties (>= 3.0.0) ipaddress (0.8.3) - jasmine (2.5.1) + jasmine (2.5.2) jasmine-core (>= 2.5.1, < 3.0.0) phantomjs rack (>= 1.2.1) @@ -827,7 +827,7 @@ DEPENDENCIES handlebars_assets (= 0.23.1) http_accept_language (= 2.1.0) i18n-inflector-rails (= 1.0.7) - jasmine (= 2.5.1) + jasmine (= 2.5.2) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.2.1) jquery-ui-rails (= 5.0.5) From 90d400724f380be912f9dfcf03ea78a3ebdbcc72 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 17:55:49 +0100 Subject: [PATCH 30/74] Bump poltergeist --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 9db268553..a6da8fece 100644 --- a/Gemfile +++ b/Gemfile @@ -279,7 +279,7 @@ group :test do gem "capybara", "2.12.1" gem "database_cleaner", "1.5.3" - gem "poltergeist", "1.11.0" + gem "poltergeist", "1.13.0" gem "cucumber-api-steps", "0.13", require: false gem "json_spec", "1.1.4" diff --git a/Gemfile.lock b/Gemfile.lock index e13379c77..400e12fbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -445,7 +445,7 @@ GEM ast (~> 2.2) pg (0.19.0) phantomjs (2.1.1.0) - poltergeist (1.11.0) + poltergeist (1.13.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -774,7 +774,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket-driver (0.6.4) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) will_paginate (3.1.5) @@ -852,7 +852,7 @@ DEPENDENCIES open_graph_reader (= 0.6.1) openid_connect (= 0.12.0) pg (= 0.19.0) - poltergeist (= 1.11.0) + poltergeist (= 1.13.0) pronto (= 0.7.1) pronto-eslint (= 0.7.0) pronto-haml (= 0.7.0) From f0cc0fdddd2f9b2c5ec0ea29fc66b41849ed306b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:00:08 +0100 Subject: [PATCH 31/74] Bump pronto --- Gemfile | 10 +++++----- Gemfile.lock | 52 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index a6da8fece..ad4a956d3 100644 --- a/Gemfile +++ b/Gemfile @@ -246,11 +246,11 @@ group :development do # Linters gem "rubocop", "0.40.0" gem "haml_lint", "0.18.2" - gem "pronto", "0.7.1" - gem "pronto-eslint", "0.7.0" - gem "pronto-rubocop", "0.7.0" - gem "pronto-haml", "0.7.0" - gem "pronto-scss", "0.7.0", require: false + gem "pronto", "0.8.2" + gem "pronto-eslint", "0.8.0" + gem "pronto-rubocop", "0.8.0" + gem "pronto-haml", "0.8.0" + gem "pronto-scss", "0.8.0", require: false # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index 400e12fbf..bcee413d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -386,7 +386,7 @@ GEM rails multi_json (1.12.1) multi_test (0.1.2) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) mysql2 (0.4.5) naught (1.1.0) @@ -405,8 +405,8 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) + octokit (4.6.2) + sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.4.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) @@ -450,24 +450,24 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - pronto (0.7.1) + pronto (0.8.2) gitlab (~> 3.6, >= 3.4.0) - httparty (~> 0.13.7) + httparty (>= 0.13.7, < 0.15) octokit (~> 4.3, >= 4.1.0) rainbow (~> 2.1) rugged (~> 0.24, >= 0.23.0) thor (~> 0.19.0) - pronto-eslint (0.7.0) + pronto-eslint (0.8.0) eslintrb (~> 2.0, >= 2.0.0) - pronto (~> 0.7.0) - pronto-haml (0.7.0) + pronto (~> 0.8.0) + pronto-haml (0.8.0) haml_lint (~> 0.16, >= 0.15.0) - pronto (~> 0.7.0) - pronto-rubocop (0.7.0) - pronto (~> 0.7.0) + pronto (~> 0.8.0) + pronto-rubocop (0.8.0) + pronto (~> 0.8.0) rubocop (~> 0.38, >= 0.35.0) - pronto-scss (0.7.0) - pronto (~> 0.7.0) + pronto-scss (0.8.0) + pronto (~> 0.8.0) scss_lint (~> 0.43, >= 0.43.0) pry (0.10.4) coderay (~> 1.1.0) @@ -590,7 +590,7 @@ GEM activesupport (= 4.2.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) + rainbow (2.2.1) raindrops (0.17.0) rake (11.3.0) rb-fsevent (0.9.7) @@ -637,7 +637,7 @@ GEM rubyzip (1.2.1) rufus-scheduler (3.3.4) tzinfo - rugged (0.24.0) + rugged (0.25.1.1) safe_yaml (1.0.4) sass (3.4.22) sass-rails (5.0.6) @@ -646,11 +646,11 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - scss_lint (0.49.0) - rake (>= 0.9, < 12) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + scss_lint (0.52.0) + rake (>= 0.9, < 13) sass (~> 3.4.20) secure_headers (3.6.1) useragent @@ -742,7 +742,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.1) + unicode-display_width (1.1.3) unicorn (5.2.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -853,11 +853,11 @@ DEPENDENCIES openid_connect (= 0.12.0) pg (= 0.19.0) poltergeist (= 1.13.0) - pronto (= 0.7.1) - pronto-eslint (= 0.7.0) - pronto-haml (= 0.7.0) - pronto-rubocop (= 0.7.0) - pronto-scss (= 0.7.0) + pronto (= 0.8.2) + pronto-eslint (= 0.8.0) + pronto-haml (= 0.8.0) + pronto-rubocop (= 0.8.0) + pronto-scss (= 0.8.0) pry pry-byebug quiet_assets (= 1.1.0) From 7f8c2b71e703c1bd51dfc86a8b342b9c309dd846 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:01:16 +0100 Subject: [PATCH 32/74] Bump rb-fsevent --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ad4a956d3..16ac0e8f9 100644 --- a/Gemfile +++ b/Gemfile @@ -240,7 +240,7 @@ group :development do gem "guard-cucumber", "2.1.2", require: false gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.2.0", require: false - gem "rb-fsevent", "0.9.7", require: false + gem "rb-fsevent", "0.9.8", require: false gem "rb-inotify", "0.9.7", require: false # Linters diff --git a/Gemfile.lock b/Gemfile.lock index bcee413d4..2146adf89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -593,7 +593,7 @@ GEM rainbow (2.2.1) raindrops (0.17.0) rake (11.3.0) - rb-fsevent (0.9.7) + rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) redcarpet (3.4.0) @@ -890,7 +890,7 @@ DEPENDENCIES rails-i18n (= 4.0.8) rails-timeago (= 2.11.0) rails_admin (= 0.8.1) - rb-fsevent (= 0.9.7) + rb-fsevent (= 0.9.8) rb-inotify (= 0.9.7) redcarpet (= 3.4.0) responders (= 2.3.0) From 20a0ca566fe0222d9b7f2becb07420490e91ef85 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:02:22 +0100 Subject: [PATCH 33/74] Bump rb-inotify --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 16ac0e8f9..247f5ead9 100644 --- a/Gemfile +++ b/Gemfile @@ -241,7 +241,7 @@ group :development do gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.2.0", require: false gem "rb-fsevent", "0.9.8", require: false - gem "rb-inotify", "0.9.7", require: false + gem "rb-inotify", "0.9.8", require: false # Linters gem "rubocop", "0.40.0" diff --git a/Gemfile.lock b/Gemfile.lock index 2146adf89..c034a6691 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -594,7 +594,7 @@ GEM raindrops (0.17.0) rake (11.3.0) rb-fsevent (0.9.8) - rb-inotify (0.9.7) + rb-inotify (0.9.8) ffi (>= 0.5.0) redcarpet (3.4.0) redis (3.3.3) @@ -891,7 +891,7 @@ DEPENDENCIES rails-timeago (= 2.11.0) rails_admin (= 0.8.1) rb-fsevent (= 0.9.8) - rb-inotify (= 0.9.7) + rb-inotify (= 0.9.8) redcarpet (= 3.4.0) responders (= 2.3.0) rspec-rails (= 3.5.2) From 809e0224a6617122d49f68d803f3a83dd0358cff Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:04:57 +0100 Subject: [PATCH 34/74] Bump spring --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 247f5ead9..1dd74bce4 100644 --- a/Gemfile +++ b/Gemfile @@ -254,7 +254,7 @@ group :development do # Preloading environment - gem "spring", "2.0.0" + gem "spring", "2.0.1" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index c034a6691..3a06fe45c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -679,7 +679,7 @@ GEM sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) - spring (2.0.0) + spring (2.0.1) activesupport (>= 4.2) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) @@ -906,7 +906,7 @@ DEPENDENCIES simple_captcha2 (= 0.4.3) simplecov (= 0.12.0) sinon-rails (= 1.15.0) - spring (= 2.0.0) + spring (= 2.0.1) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) string-direction (= 1.2.0) From eda0836c794c794eac136a9f543360729394d405 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:11:29 +0100 Subject: [PATCH 35/74] Bump addressable --- Gemfile | 2 +- Gemfile.lock | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1dd74bce4..147c4800e 100644 --- a/Gemfile +++ b/Gemfile @@ -172,7 +172,7 @@ gem "acts-as-taggable-on", "3.5.0" # URIs and HTTP -gem "addressable", "2.4.0", require: "addressable/uri" +gem "addressable", "2.5.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 3a06fe45c..68a42ab12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,8 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) arel (6.0.4) asset_sync (2.0.0) activemodel @@ -476,6 +477,7 @@ GEM pry-byebug (3.4.0) byebug (~> 9.0) pry (~> 0.10) + public_suffix (2.0.5) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.5) @@ -790,7 +792,7 @@ DEPENDENCIES activerecord-import (= 0.17.1) acts-as-taggable-on (= 3.5.0) acts_as_api (= 1.0.0) - addressable (= 2.4.0) + addressable (= 2.5.0) asset_sync (= 2.0.0) autoprefixer-rails (= 6.7.6) bootstrap-sass (= 3.3.7) From feb6d93251c5c8f647fa7572d3292a9f6df4c891 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:14:06 +0100 Subject: [PATCH 36/74] Bump bindata --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 68a42ab12..91d948f65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,7 +59,7 @@ GEM autoprefixer-rails (6.7.6) execjs bcrypt (3.1.11) - bindata (2.3.1) + bindata (2.3.5) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) From cf905e6bb5091bdb75eebb498bb5f279f4968b95 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:15:22 +0100 Subject: [PATCH 37/74] Bump byebug --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 91d948f65..bc5b468b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM bootstrap-switch-rails (3.3.3) buftok (0.2.0) builder (3.2.3) - byebug (9.0.5) + byebug (9.0.6) capybara (2.12.1) addressable mime-types (>= 1.16) From 574f5c6e9916721e7f2cfcaa97cc89b5fbab78fc Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:16:17 +0100 Subject: [PATCH 38/74] Bump chunky_png --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bc5b468b0..9bb383e39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,7 +101,7 @@ GEM timers (>= 4.1.1) celluloid-supervision (0.20.6) timers (>= 4.1.1) - chunky_png (1.3.6) + chunky_png (1.3.8) cliver (0.3.2) coderay (1.1.1) coffee-rails (4.2.1) From 4f3cfbf1d8b49800b1570489f3fd92b5872a2025 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:20:40 +0100 Subject: [PATCH 39/74] Bump coffee-script-source --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9bb383e39..c22429942 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,7 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) compass (1.0.3) chunky_png (~> 1.2) compass-core (~> 1.0.2) From 52d16d22776eb92d78c62a268d8c02aceeb4c9fa Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:25:12 +0100 Subject: [PATCH 40/74] Bump diff-lcs --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c22429942..37f122c80 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,7 +182,7 @@ GEM diaspora_federation-test (0.1.7) diaspora_federation (= 0.1.7) factory_girl (~> 4.7) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) domain_name (0.5.20160615) unf (>= 0.0.5, < 1.0.0) From d8d3d063c5d5f764cf7772db1e2ed0a3a427919e Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:26:07 +0100 Subject: [PATCH 41/74] Bump domain_name --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 37f122c80..5bc378d6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,7 +184,7 @@ GEM factory_girl (~> 4.7) diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20160615) + domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) entypo-rails (3.0.0.pre.rc2) railties (>= 4.1, <= 5) From 1173046c6bd8880d8599b9414b8ff544c3517d14 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:28:46 +0100 Subject: [PATCH 42/74] Bump entypo-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 147c4800e..bc70cc117 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ gem "uuid", "2.3.8" # Icons -gem "entypo-rails", "3.0.0.pre.rc2" +gem "entypo-rails", "3.0.0" # JavaScript diff --git a/Gemfile.lock b/Gemfile.lock index 5bc378d6d..5d8a2c4d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -186,8 +186,8 @@ GEM docile (1.1.5) domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) - entypo-rails (3.0.0.pre.rc2) - railties (>= 4.1, <= 5) + entypo-rails (3.0.0) + railties (>= 4.1, < 6) equalizer (0.0.10) erubis (2.7.0) eslintrb (2.1.0) @@ -810,7 +810,7 @@ DEPENDENCIES diaspora-prosody-config (= 0.0.7) diaspora_federation-rails (= 0.1.7) diaspora_federation-test (= 0.1.7) - entypo-rails (= 3.0.0.pre.rc2) + entypo-rails (= 3.0.0) eye (= 0.9.1) factory_girl_rails (= 4.8.0) faraday (= 0.9.2) From f1ba71aaee0e1eda229dfd8d55eae9fd79ed823e Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:39:09 +0100 Subject: [PATCH 43/74] Bump excon --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5d8a2c4d0..8ab17e72b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,7 +196,7 @@ GEM rake ethon (0.10.1) ffi (>= 1.3.0) - excon (0.54.0) + excon (0.55.0) execjs (2.7.0) eye (0.9.1) celluloid (~> 0.17.3) From 8a92724b4a8c44193fd35134962e8200afbcca54 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 18:40:26 +0100 Subject: [PATCH 44/74] Bump fog-aws --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index bc70cc117..032dc65b5 100644 --- a/Gemfile +++ b/Gemfile @@ -72,7 +72,7 @@ gem "activerecord-import", "0.17.1" # File uploading -gem "fog-aws", "1.2.0" +gem "fog-aws", "1.2.1" gem "carrierwave", "0.11.2" gem "mini_magick", "4.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index 8ab17e72b..95cb77b36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,7 +220,7 @@ GEM fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) - fog-aws (1.2.0) + fog-aws (1.2.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) @@ -817,7 +817,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) - fog-aws (= 1.2.0) + fog-aws (= 1.2.1) fuubar (= 2.2.0) gon (= 6.1.0) guard (= 2.14.1) From 5f7ffc4094d9d9eade856933fd27edfb882e26d5 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:04:59 +0100 Subject: [PATCH 45/74] Bump font-awesome-rails --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 95cb77b36..60be6141e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -235,7 +235,7 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.7.0.1) railties (>= 3.2, < 5.1) formatador (0.2.5) fuubar (2.2.0) From dd9371a956f85a96a0b5e6db9e60d304d2bf2f8a Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:07:39 +0100 Subject: [PATCH 46/74] Bump http-cookie --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 60be6141e..54aaec809 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -299,7 +299,7 @@ GEM http-cookie (~> 1.0) http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (1.0.1) http_accept_language (2.1.0) From d33a36c18430aa63c64b397e58af1a91b924657a Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:11:24 +0100 Subject: [PATCH 47/74] Bump httpclient --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 54aaec809..5a353176a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -307,7 +307,7 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.1) + httpclient (2.8.3) i18n (0.8.1) i18n-inflector (2.6.7) i18n (>= 0.4.1) From af8101d718c17e11530ec13ac6d73db534a73100 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:12:56 +0100 Subject: [PATCH 48/74] Bump json-jwt --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5a353176a..d5f50e66a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -335,7 +335,7 @@ GEM js_image_paths (0.1.0) rails (~> 4.0) json (1.8.6) - json-jwt (1.6.3) + json-jwt (1.7.1) activesupport bindata multi_json (>= 1.3) From ffeb9f1b7eb4169de6c176e367a70f7c72f8f25b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:14:36 +0100 Subject: [PATCH 49/74] Bump jwt --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d5f50e66a..062e07340 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -348,7 +348,7 @@ GEM rspec (>= 2.0, < 4.0) jsonpath (0.5.8) multi_json - jwt (1.5.4) + jwt (1.5.6) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) From c00e6f788e938bda5e569cb13e47aaba83461647 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:16:04 +0100 Subject: [PATCH 50/74] Bump kaminari --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 062e07340..a4df2c7a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -349,7 +349,7 @@ GEM jsonpath (0.5.8) multi_json jwt (1.5.6) - kaminari (0.16.3) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.11.0) From 934f938fe2b8f919edc67aa1e78d97ed438978f0 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:17:38 +0100 Subject: [PATCH 51/74] Bump mimemagic --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a4df2c7a0..77bca18d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -378,7 +378,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.1) + mimemagic (0.3.2) mini_magick (4.6.1) mini_portile2 (2.1.0) minitest (5.10.1) From 0e946078f3fe1ee74429c36842d3b38aae62853d Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:18:33 +0100 Subject: [PATCH 52/74] Bump oauth2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 77bca18d5..02ecd42f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,8 +400,8 @@ GEM nenv (~> 0.1) shellany (~> 0.0) oauth (0.5.1) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) + oauth2 (1.3.1) + faraday (>= 0.8, < 0.12) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) From 622100d1e50f9e1a87911e85e1b2b9c1edfa8125 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:20:12 +0100 Subject: [PATCH 53/74] Bump parser --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 02ecd42f6..ed2c81218 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -442,7 +442,7 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parser (2.3.1.4) + parser (2.4.0.0) ast (~> 2.2) pg (0.19.0) phantomjs (2.1.1.0) From aa3c78375a6913c3f187fadb2dc4fb4e95b7cd01 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:21:25 +0100 Subject: [PATCH 54/74] Bump pry-byebug --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed2c81218..e79224bbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -474,7 +474,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.4.0) + pry-byebug (3.4.2) byebug (~> 9.0) pry (~> 0.10) public_suffix (2.0.5) From a0ec287cc9f35fae4c3e43f57f5baec8bc2983a4 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 19:23:27 +0100 Subject: [PATCH 55/74] Bump rack-oauth2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e79224bbf..6cb4f9c16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -487,7 +487,7 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.4.0) + rack-oauth2 (1.5.1) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) From b12a471a4a59e44008fd67cd3cf5bf5295cc910e Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 20:37:39 +0100 Subject: [PATCH 56/74] Bump blueimp-gallery --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 032dc65b5..76850c502 100644 --- a/Gemfile +++ b/Gemfile @@ -114,7 +114,7 @@ source "https://rails-assets.org" do gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-perfect-scrollbar", "0.6.12" gem "rails-assets-autosize", "3.0.20" - gem "rails-assets-blueimp-gallery", "2.21.3" + gem "rails-assets-blueimp-gallery", "2.25.0" end # Localization diff --git a/Gemfile.lock b/Gemfile.lock index 6cb4f9c16..04b6b8a70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -518,7 +518,7 @@ GEM rails-assets-autosize (3.0.20) rails-assets-backbone (1.3.3) rails-assets-underscore (>= 1.8.3) - rails-assets-blueimp-gallery (2.21.3) + rails-assets-blueimp-gallery (2.25.0) rails-assets-bootstrap (3.3.7) rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.10.0) @@ -871,7 +871,7 @@ DEPENDENCIES rails (= 4.2.8) rails-assets-autosize (= 3.0.20)! rails-assets-backbone (= 1.3.3)! - rails-assets-blueimp-gallery (= 2.21.3)! + rails-assets-blueimp-gallery (= 2.25.0)! rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-corejs-typeahead (= 1.0.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! From 9e311ca41d1db02e2130311e734860653fc532ca Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 20:38:37 +0100 Subject: [PATCH 57/74] Bump corejs-typeahead --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 76850c502..98e56c6e7 100644 --- a/Gemfile +++ b/Gemfile @@ -105,7 +105,7 @@ source "https://rails-assets.org" do gem "rails-assets-backbone", "1.3.3" gem "rails-assets-bootstrap-markdown", "2.10.0" - gem "rails-assets-corejs-typeahead", "1.0.1" + gem "rails-assets-corejs-typeahead", "1.1.1" gem "rails-assets-fineuploader-dist", "5.11.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 04b6b8a70..34db0227c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -523,8 +523,8 @@ GEM rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.10.0) rails-assets-bootstrap (~> 3) - rails-assets-corejs-typeahead (1.0.1) - rails-assets-jquery (>= 1.7) + rails-assets-corejs-typeahead (1.1.1) + rails-assets-jquery (>= 1.11) rails-assets-diaspora_jsxc (0.1.5.develop.7) rails-assets-emojione (~> 2.0.1) rails-assets-favico.js (>= 0.3.10, < 0.4) @@ -873,7 +873,7 @@ DEPENDENCIES rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.25.0)! rails-assets-bootstrap-markdown (= 2.10.0)! - rails-assets-corejs-typeahead (= 1.0.1)! + rails-assets-corejs-typeahead (= 1.1.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-fineuploader-dist (= 5.11.0)! rails-assets-highlightjs (= 9.7.0)! From ff64581a7059e87812e5f2fd1f14764cb4e0a417 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 20:51:29 +0100 Subject: [PATCH 58/74] Bump fineuploader --- Gemfile | 2 +- Gemfile.lock | 4 ++-- app/assets/javascripts/jasmine-load-all.js | 2 +- app/assets/javascripts/main.js | 2 +- app/assets/javascripts/mobile/mobile.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 98e56c6e7..04aa8c053 100644 --- a/Gemfile +++ b/Gemfile @@ -106,7 +106,7 @@ source "https://rails-assets.org" do gem "rails-assets-backbone", "1.3.3" gem "rails-assets-bootstrap-markdown", "2.10.0" gem "rails-assets-corejs-typeahead", "1.1.1" - gem "rails-assets-fineuploader-dist", "5.11.0" + gem "rails-assets-fine-uploader", "5.13.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 34db0227c..ae6459503 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -534,7 +534,7 @@ GEM rails-assets-jquery.ui (~> 1.11.4) rails-assets-emojione (2.0.1) rails-assets-favico.js (0.3.10) - rails-assets-fineuploader-dist (5.11.0) + rails-assets-fine-uploader (5.13.0) rails-assets-highlightjs (9.7.0) rails-assets-jasmine (2.4.1) rails-assets-jasmine-ajax (3.2.0) @@ -875,7 +875,7 @@ DEPENDENCIES rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-corejs-typeahead (= 1.1.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! - rails-assets-fineuploader-dist (= 5.11.0)! + rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.7.0)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jquery (= 2.2.4)! diff --git a/app/assets/javascripts/jasmine-load-all.js b/app/assets/javascripts/jasmine-load-all.js index 756f84ce7..be83acdec 100644 --- a/app/assets/javascripts/jasmine-load-all.js +++ b/app/assets/javascripts/jasmine-load-all.js @@ -2,7 +2,7 @@ //= require handlebars.runtime //= require templates //= require main -//= require fineuploader-dist/dist/fine-uploader.core +//= require fine-uploader/fine-uploader.core //= require mobile/mobile //= require jquery.autoSuggest.custom //= require contact-list diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 96acc6b46..87f9d1cba 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -18,7 +18,7 @@ //= require jquery-ui/sortable //= require keycodes //= require jquery.autoSuggest.custom -//= require fineuploader-dist/dist/fine-uploader.core +//= require fine-uploader/fine-uploader.core //= require handlebars.runtime //= require posix-bracket-expressions //= require markdown-it diff --git a/app/assets/javascripts/mobile/mobile.js b/app/assets/javascripts/mobile/mobile.js index 70f55e694..c7259edda 100644 --- a/app/assets/javascripts/mobile/mobile.js +++ b/app/assets/javascripts/mobile/mobile.js @@ -10,7 +10,7 @@ //= require autosize //= require keycodes //= require jquery.autoSuggest.custom -//= require fineuploader-dist/dist/fine-uploader.core +//= require fine-uploader/fine-uploader.core //= require rails-timeago //= require underscore //= require bootstrap From d1bdaa02e48320764ea48bb78b8e990c54e67455 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 20:52:51 +0100 Subject: [PATCH 59/74] Bump highlightjs --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 04aa8c053..a5397b5cc 100644 --- a/Gemfile +++ b/Gemfile @@ -101,7 +101,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.7.0" + gem "rails-assets-highlightjs", "9.9.0" gem "rails-assets-backbone", "1.3.3" gem "rails-assets-bootstrap-markdown", "2.10.0" diff --git a/Gemfile.lock b/Gemfile.lock index ae6459503..d1cde4aaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -535,7 +535,7 @@ GEM rails-assets-emojione (2.0.1) rails-assets-favico.js (0.3.10) rails-assets-fine-uploader (5.13.0) - rails-assets-highlightjs (9.7.0) + rails-assets-highlightjs (9.9.0) rails-assets-jasmine (2.4.1) rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine (~> 2) @@ -876,7 +876,7 @@ DEPENDENCIES rails-assets-corejs-typeahead (= 1.1.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-fine-uploader (= 5.13.0)! - rails-assets-highlightjs (= 9.7.0)! + rails-assets-highlightjs (= 9.9.0)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jquery (= 2.2.4)! rails-assets-jquery-placeholder (= 2.3.1)! From fc44341f0ea7de346fcedd9e17ebc9ce22877830 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 20:54:55 +0100 Subject: [PATCH 60/74] Bump jasmine-ajax --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a5397b5cc..576ad2734 100644 --- a/Gemfile +++ b/Gemfile @@ -307,7 +307,7 @@ group :development, :test do # Jasmine (client side application tests (JS)) gem "jasmine", "2.5.2" gem "jasmine-jquery-rails", "2.0.3" - gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org" + gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" # silence assets diff --git a/Gemfile.lock b/Gemfile.lock index d1cde4aaf..a5d5e90dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -536,8 +536,8 @@ GEM rails-assets-favico.js (0.3.10) rails-assets-fine-uploader (5.13.0) rails-assets-highlightjs (9.9.0) - rails-assets-jasmine (2.4.1) - rails-assets-jasmine-ajax (3.2.0) + rails-assets-jasmine (2.5.2) + rails-assets-jasmine-ajax (3.3.1) rails-assets-jasmine (~> 2) rails-assets-jquery (2.2.4) rails-assets-jquery-colorbox (1.6.4) @@ -877,7 +877,7 @@ DEPENDENCIES rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.9.0)! - rails-assets-jasmine-ajax (= 3.2.0)! + rails-assets-jasmine-ajax (= 3.3.1)! rails-assets-jquery (= 2.2.4)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! From 6929370c152a6718581ac2f3b7fce400c49f1a66 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 20:56:52 +0100 Subject: [PATCH 61/74] Bump markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 576ad2734..acbe6cee7 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,7 @@ gem "js-routes", "1.3.3" 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", "8.2.2" + gem "rails-assets-markdown-it", "8.3.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "1.1.1" gem "rails-assets-markdown-it-sanitizer", "0.4.3" diff --git a/Gemfile.lock b/Gemfile.lock index a5d5e90dc..e8a415010 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -551,7 +551,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 (8.2.2) + rails-assets-markdown-it (8.3.0) rails-assets-markdown-it-diaspora-mention (1.1.1) rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-sanitizer (0.4.3) @@ -881,7 +881,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 (= 8.2.2)! + rails-assets-markdown-it (= 8.3.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 1.1.1)! rails-assets-markdown-it-hashtag (= 0.4.0)! From 27f46c7149f2c4d4faf5187e96a4cff1e4a7b74a Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 20:57:52 +0100 Subject: [PATCH 62/74] Bump perfect-scrollbar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index acbe6cee7..a5724fbe6 100644 --- a/Gemfile +++ b/Gemfile @@ -112,7 +112,7 @@ source "https://rails-assets.org" do gem "rails-assets-jquery-placeholder", "2.3.1" gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.12" + gem "rails-assets-perfect-scrollbar", "0.6.16" gem "rails-assets-autosize", "3.0.20" gem "rails-assets-blueimp-gallery", "2.25.0" end diff --git a/Gemfile.lock b/Gemfile.lock index e8a415010..156efdd8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -557,7 +557,7 @@ GEM 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) + rails-assets-perfect-scrollbar (0.6.16) rails-assets-underscore (1.8.3) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -888,7 +888,7 @@ DEPENDENCIES 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)! + rails-assets-perfect-scrollbar (= 0.6.16)! rails-i18n (= 4.0.8) rails-timeago (= 2.11.0) rails_admin (= 0.8.1) From 0ebc34c476a43bbb8437f299f4497370d448208c Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 21:02:15 +0100 Subject: [PATCH 63/74] Bump remotipart --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 156efdd8d..bd324bd39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -602,7 +602,7 @@ GEM redis (3.3.3) redis-namespace (1.5.3) redis (~> 3.0, >= 3.0.4) - remotipart (1.2.1) + remotipart (1.3.1) request_store (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) From c94c7492aac0bfeb1c69298da6c72f5b8e7479f8 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 21:03:36 +0100 Subject: [PATCH 64/74] Bump request_store --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bd324bd39..d1cedc7db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -603,7 +603,7 @@ GEM redis-namespace (1.5.3) redis (~> 3.0, >= 3.0.4) remotipart (1.3.1) - request_store (1.3.1) + request_store (1.3.2) responders (2.3.0) railties (>= 4.2.0, < 5.1) rspec (3.5.0) From 8cfd5530ad3fa1cd35b9949439b4727b8d399834 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 21:04:23 +0100 Subject: [PATCH 65/74] Bump sass --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d1cedc7db..f4591d72a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -641,7 +641,7 @@ GEM tzinfo rugged (0.25.1.1) safe_yaml (1.0.4) - sass (3.4.22) + sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) From 8c1f2dde6696051cdedf8d20f82b7b0bb5a9afbb Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 21:06:23 +0100 Subject: [PATCH 66/74] Bump warden --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f4591d72a..0060e6e69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -766,7 +766,7 @@ GEM activesupport (>= 3) railties (>= 3) yard (~> 0.7) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) webfinger (1.0.2) activesupport From e12b0096c49237dc8e546b4e19d17660ac97f539 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 21:07:41 +0100 Subject: [PATCH 67/74] Bump yard --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0060e6e69..b3e382e77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -782,7 +782,7 @@ GEM will_paginate (3.1.5) xpath (2.0.0) nokogiri (~> 1.3) - yard (0.8.7.6) + yard (0.9.8) PLATFORMS ruby From 47129aa4aeff0dc31a8960a43a5c5a547a653710 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 21:12:29 +0100 Subject: [PATCH 68/74] Bump diaspora_federation --- Gemfile | 4 ++-- Gemfile.lock | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index a5724fbe6..7f11fbf26 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4" # Federation -gem "diaspora_federation-rails", "0.1.7" +gem "diaspora_federation-rails", "0.1.8" # API and JSON @@ -291,7 +291,7 @@ group :test do gem "webmock", "2.3.2", require: false gem "shoulda-matchers", "3.1.1" - gem "diaspora_federation-test", "0.1.7" + gem "diaspora_federation-test", "0.1.8" # Coverage gem 'coveralls', require: false diff --git a/Gemfile.lock b/Gemfile.lock index b3e382e77..985bb8c94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,18 +170,19 @@ GEM devise rails (>= 3.0.4) diaspora-prosody-config (0.0.7) - diaspora_federation (0.1.7) - faraday (>= 0.9.0, < 0.11.0) - faraday_middleware (~> 0.10.0) + diaspora_federation (0.1.8) + faraday (>= 0.9.0, < 0.12.0) + faraday_middleware (>= 0.10.0, < 0.12.0) nokogiri (~> 1.6, >= 1.6.8) typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-rails (0.1.7) - diaspora_federation (= 0.1.7) + diaspora_federation-rails (0.1.8) + diaspora_federation (= 0.1.8) rails (>= 4.2, < 6) - diaspora_federation-test (0.1.7) - diaspora_federation (= 0.1.7) + diaspora_federation-test (0.1.8) + diaspora_federation (= 0.1.8) factory_girl (~> 4.7) + uuid (~> 2.3.8) diff-lcs (1.3) docile (1.1.5) domain_name (0.5.20170223) @@ -808,8 +809,8 @@ DEPENDENCIES devise (= 4.2.0) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) - diaspora_federation-rails (= 0.1.7) - diaspora_federation-test (= 0.1.7) + diaspora_federation-rails (= 0.1.8) + diaspora_federation-test (= 0.1.8) entypo-rails (= 3.0.0) eye (= 0.9.1) factory_girl_rails (= 4.8.0) From f1ecb8e121178b31179ef4a21637c6c81be0967f Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 21:14:04 +0100 Subject: [PATCH 69/74] Bump open_graph_reader --- Gemfile | 2 +- Gemfile.lock | 6 +++--- features/support/webmock.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 7f11fbf26..40424b724 100644 --- a/Gemfile +++ b/Gemfile @@ -136,7 +136,7 @@ gem "nokogiri", "1.7.0.1" gem "redcarpet", "3.4.0" gem "twitter-text", "1.14.5" gem "ruby-oembed", "0.10.1" -gem "open_graph_reader", "0.6.1" +gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb # RTL support diff --git a/Gemfile.lock b/Gemfile.lock index 985bb8c94..ef4b2fdd0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -428,8 +428,8 @@ GEM rack omniauth-wordpress (0.2.2) omniauth-oauth2 (>= 1.1.0) - open_graph_reader (0.6.1) - faraday (~> 0.9.0) + open_graph_reader (0.6.2) + faraday (>= 0.9.0) nokogiri (~> 1.6) openid_connect (0.12.0) activemodel @@ -852,7 +852,7 @@ DEPENDENCIES omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) - open_graph_reader (= 0.6.1) + open_graph_reader (= 0.6.2) openid_connect (= 0.12.0) pg (= 0.19.0) poltergeist (= 1.13.0) diff --git a/features/support/webmock.rb b/features/support/webmock.rb index 017336779..372d81803 100644 --- a/features/support/webmock.rb +++ b/features/support/webmock.rb @@ -5,7 +5,7 @@ Before do stub_request(:head, /.+/).with( headers: { "Accept" => "text/html", - "User-Agent" => "OpenGraphReader/0.6.1 (+https://github.com/jhass/open_graph_reader)" + "User-Agent" => "OpenGraphReader/0.6.2 (+https://github.com/jhass/open_graph_reader)" } ).to_return(status: 200, body: "", headers: {"Content-Type" => "text/plain"}) end From 8330e5ef727635f0c8eb95891852495b112b7de9 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 21:29:18 +0100 Subject: [PATCH 70/74] Bump faraday_middleware --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 40424b724..e5c1230d4 100644 --- a/Gemfile +++ b/Gemfile @@ -174,7 +174,7 @@ gem "acts-as-taggable-on", "3.5.0" gem "addressable", "2.5.0", require: "addressable/uri" gem "faraday", "0.9.2" -gem "faraday_middleware", "0.10.0" +gem "faraday_middleware", "0.11.0.1" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "1.1.2" diff --git a/Gemfile.lock b/Gemfile.lock index ef4b2fdd0..fecf0ad32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,8 +215,8 @@ GEM faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) + faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) ffi (1.9.17) fixture_builder (0.4.1) activerecord (>= 2) @@ -816,7 +816,7 @@ DEPENDENCIES factory_girl_rails (= 4.8.0) faraday (= 0.9.2) faraday-cookie_jar (= 0.0.6) - faraday_middleware (= 0.10.0) + faraday_middleware (= 0.11.0.1) fixture_builder (= 0.4.1) fog-aws (= 1.2.1) fuubar (= 2.2.0) From 13f549b2ba46e25da156854efa660f21945e3403 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 3 Mar 2017 03:25:11 +0100 Subject: [PATCH 71/74] Bump rubocop And update config for new/updated cops. --- .rubocop.yml | 24 +++++++++++++++++++++++- Gemfile | 2 +- Gemfile.lock | 6 +++--- lib/node_info.rb | 2 ++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2ee483e70..fae72b1a6 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -25,6 +25,15 @@ Metrics/ModuleLength: Metrics/AbcSize: Max: 20 +# Some blocks are longer. +Metrics/BlockLength: + ExcludedMethods: + - "namespace" + - "create_table" + Exclude: + - "config/**/*.rb" + - "spec/**/*.rb" + # No space makes the method definition shorter and differentiates # from a regular assignment. Style/SpaceAroundEqualsInParameterDefault: @@ -51,7 +60,7 @@ Style/HashSyntax: EnforcedStyle: ruby19_no_mixed_keys # has_key? and has_value? are far more readable than key? and value? -Style/DeprecatedHashMethods: +Style/PreferredHashMethods: Enabled: false # String#% is by far the least verbose and only object oriented variant. @@ -147,7 +156,20 @@ Style/OpMethod: Lint/Debugger: Enabled: false +# We used comparison everywhere. +Style/NumericPredicate: + EnforcedStyle: comparison # Reset some HoundCI changes back to Rubocop defaults Style/DotPosition: EnforcedStyle: leading + +### backward compatibility + +# only with ruby >= 2.3 +Style/FrozenStringLiteralComment: + Enabled: false + +# only with ruby >= 2.4 +Performance/RegexpMatch: + Enabled: false diff --git a/Gemfile b/Gemfile index e5c1230d4..198509e14 100644 --- a/Gemfile +++ b/Gemfile @@ -244,7 +244,7 @@ group :development do gem "rb-inotify", "0.9.8", require: false # Linters - gem "rubocop", "0.40.0" + gem "rubocop", "0.47.1" gem "haml_lint", "0.18.2" gem "pronto", "0.8.2" gem "pronto-eslint", "0.8.0" diff --git a/Gemfile.lock b/Gemfile.lock index fecf0ad32..8c7807435 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -628,8 +628,8 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) + rubocop (0.47.1) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) @@ -898,7 +898,7 @@ DEPENDENCIES redcarpet (= 3.4.0) responders (= 2.3.0) rspec-rails (= 3.5.2) - rubocop (= 0.40.0) + rubocop (= 0.47.1) ruby-oembed (= 0.10.1) rubyzip (= 1.2.1) sass-rails (= 5.0.6) diff --git a/lib/node_info.rb b/lib/node_info.rb index 0b4657d3a..eb012f98e 100644 --- a/lib/node_info.rb +++ b/lib/node_info.rb @@ -6,6 +6,7 @@ module NodeInfo SCHEMAS = {} private_constant :VERSIONS, :SCHEMAS + # rubocop:disable Metrics/BlockLength Document = Struct.new(:version, :software, :protocols, :services, :open_registrations, :usage, :metadata) do Software = Struct.new(:name, :version) do def initialize(name=nil, version=nil) @@ -132,6 +133,7 @@ module NodeInfo end end end + # rubocop:enable Metrics/BlockLength def self.schema(version) SCHEMAS[version] ||= JSON.parse( From af4f98f4ba28debfc9cfe590043a62174d12d1dc Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Fri, 3 Mar 2017 11:09:14 +0100 Subject: [PATCH 72/74] Bump haml_lint --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 198509e14..f2ded124f 100644 --- a/Gemfile +++ b/Gemfile @@ -245,7 +245,7 @@ group :development do # Linters gem "rubocop", "0.47.1" - gem "haml_lint", "0.18.2" + gem "haml_lint", "0.21.0" gem "pronto", "0.8.2" gem "pronto-eslint", "0.8.0" gem "pronto-rubocop", "0.8.0" diff --git a/Gemfile.lock b/Gemfile.lock index 8c7807435..a13454db2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -277,10 +277,10 @@ GEM rubocop (~> 0.20) haml (4.0.7) tilt - haml_lint (0.18.2) + haml_lint (0.21.0) haml (~> 4.0) - rake (>= 10, < 12) - rubocop (>= 0.36.0) + rake (>= 10, < 13) + rubocop (>= 0.47.0) sysexits (~> 1.1) hamlit (2.8.0) temple (>= 0.8.0) @@ -595,7 +595,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.1) raindrops (0.17.0) - rake (11.3.0) + rake (12.0.0) rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) @@ -825,7 +825,7 @@ DEPENDENCIES guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.2.0) - haml_lint (= 0.18.2) + haml_lint (= 0.21.0) hamlit (= 2.8.0) handlebars_assets (= 0.23.1) http_accept_language (= 2.1.0) From c485aa329459dbf28268354cf52ad59d788b3d9e Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Fri, 3 Mar 2017 11:14:00 +0100 Subject: [PATCH 73/74] Fix order of gems in Gemfile for pronto --- Gemfile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index f2ded124f..9aa1007d5 100644 --- a/Gemfile +++ b/Gemfile @@ -52,11 +52,11 @@ gem "rack-cors", "0.4.1", require: "rack/cors" # CSS -gem "bootstrap-sass", "3.3.7" -gem "compass-rails", "2.0.5" -gem "sass-rails", "5.0.6" -gem "autoprefixer-rails", "6.7.6" +gem "autoprefixer-rails", "6.7.6" +gem "bootstrap-sass", "3.3.7" gem "bootstrap-switch-rails", "3.3.3" +gem "compass-rails", "2.0.5" +gem "sass-rails", "5.0.6" # Database @@ -88,12 +88,13 @@ gem "entypo-rails", "3.0.0" gem "handlebars_assets", "0.23.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.3.3" +gem "js_image_paths", "0.1.0" source "https://rails-assets.org" do gem "rails-assets-jquery", "2.2.4" # Should be kept in sync with jquery-rails + gem "rails-assets-highlightjs", "9.9.0" gem "rails-assets-markdown-it", "8.3.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "1.1.1" @@ -101,7 +102,6 @@ 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.9.0" gem "rails-assets-backbone", "1.3.3" gem "rails-assets-bootstrap-markdown", "2.10.0" @@ -110,11 +110,11 @@ source "https://rails-assets.org" do # jQuery plugins - gem "rails-assets-jquery-placeholder", "2.3.1" - gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.16" - gem "rails-assets-autosize", "3.0.20" - gem "rails-assets-blueimp-gallery", "2.25.0" + gem "rails-assets-autosize", "3.0.20" + gem "rails-assets-blueimp-gallery", "2.25.0" + gem "rails-assets-jquery-placeholder", "2.3.1" + gem "rails-assets-jquery-textchange", "0.2.3" + gem "rails-assets-perfect-scrollbar", "0.6.16" end # Localization @@ -133,10 +133,10 @@ gem "leaflet-rails", "0.7.7" # Parsing gem "nokogiri", "1.7.0.1" -gem "redcarpet", "3.4.0" -gem "twitter-text", "1.14.5" -gem "ruby-oembed", "0.10.1" gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb +gem "redcarpet", "3.4.0" +gem "ruby-oembed", "0.10.1" +gem "twitter-text", "1.14.5" # RTL support @@ -244,13 +244,13 @@ group :development do gem "rb-inotify", "0.9.8", require: false # Linters - gem "rubocop", "0.47.1" gem "haml_lint", "0.21.0" gem "pronto", "0.8.2" gem "pronto-eslint", "0.8.0" - gem "pronto-rubocop", "0.8.0" gem "pronto-haml", "0.8.0" + gem "pronto-rubocop", "0.8.0" gem "pronto-scss", "0.8.0", require: false + gem "rubocop", "0.47.1" # Preloading environment From 612455d41f5526063dd8239c3ceeaceee67a7419 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Fri, 3 Mar 2017 11:48:58 +0100 Subject: [PATCH 74/74] Bump faraday and twitter closes #7348 --- Gemfile | 4 +-- Gemfile.lock | 27 +++++++++---------- .../openid_connect/clients_controller_spec.rb | 21 +++++++++------ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Gemfile b/Gemfile index 9aa1007d5..1000c422d 100644 --- a/Gemfile +++ b/Gemfile @@ -152,7 +152,7 @@ gem "omniauth", "1.4.2" gem "omniauth-facebook", "4.0.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" -gem "twitter", "5.16.0" +gem "twitter", "6.1.0" gem "omniauth-wordpress", "0.2.2" # OpenID Connect @@ -173,7 +173,7 @@ gem "acts-as-taggable-on", "3.5.0" # URIs and HTTP gem "addressable", "2.5.0", require: "addressable/uri" -gem "faraday", "0.9.2" +gem "faraday", "0.11.0" # also update User-Agent in OpenID specs gem "faraday_middleware", "0.11.0.1" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "1.1.2" diff --git a/Gemfile.lock b/Gemfile.lock index a13454db2..06cde3e12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -189,7 +189,7 @@ GEM unf (>= 0.0.5, < 1.0.0) entypo-rails (3.0.0) railties (>= 4.1, < 6) - equalizer (0.0.10) + equalizer (0.0.11) erubis (2.7.0) eslintrb (2.1.0) execjs @@ -210,7 +210,7 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.9.2) + faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -295,7 +295,7 @@ GEM hashie (3.5.5) hike (1.2.3) hitimes (1.2.4) - http (1.0.4) + http (2.2.1) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) @@ -723,17 +723,16 @@ GEM hitimes tins (1.13.2) turbo_dev_assets (0.0.2) - twitter (5.16.0) - addressable (~> 2.3) + twitter (6.1.0) + addressable (~> 2.5) buftok (~> 0.2.0) - equalizer (= 0.0.10) - faraday (~> 0.9.0) - http (~> 1.0) + equalizer (= 0.0.11) + faraday (~> 0.11.0) + http (~> 2.1) http_parser.rb (~> 0.6.0) - json (~> 1.8) - memoizable (~> 0.4.0) - naught (~> 1.0) - simple_oauth (~> 0.3.0) + memoizable (~> 0.4.2) + naught (~> 1.1) + simple_oauth (~> 0.3.1) twitter-text (1.14.5) unf (~> 0.1.0) typhoeus (1.1.2) @@ -814,7 +813,7 @@ DEPENDENCIES entypo-rails (= 3.0.0) eye (= 0.9.1) factory_girl_rails (= 4.8.0) - faraday (= 0.9.2) + faraday (= 0.11.0) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.11.0.1) fixture_builder (= 0.4.1) @@ -916,7 +915,7 @@ DEPENDENCIES test_after_commit (= 1.1.0) timecop (= 0.8.1) turbo_dev_assets (= 0.0.2) - twitter (= 5.16.0) + twitter (= 6.1.0) twitter-text (= 1.14.5) typhoeus (= 1.1.2) uglifier (= 3.1.2) diff --git a/spec/controllers/api/openid_connect/clients_controller_spec.rb b/spec/controllers/api/openid_connect/clients_controller_spec.rb index 5477d2fa3..a12ad43b8 100644 --- a/spec/controllers/api/openid_connect/clients_controller_spec.rb +++ b/spec/controllers/api/openid_connect/clients_controller_spec.rb @@ -6,7 +6,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.9.2" + "User-Agent" => "Faraday v0.11.0" }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) post :create, redirect_uris: ["http://localhost"], client_name: "diaspora client", @@ -26,7 +26,8 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.9.2"}) + "User-Agent" => "Faraday v0.11.0" + }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) post :create, redirect_uris: ["http://localhost"], client_name: "diaspora client", response_types: [], grant_types: [], application_type: "web", contacts: [], @@ -83,14 +84,18 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf context "when valid parameters with jwks_uri is passed" do it "should return a client id" do stub_request(:get, "http://example.com/uris") - .with(headers: {"Accept" => "*/*", - "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.9.2"}) + .with(headers: { + "Accept" => "*/*", + "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", + "User-Agent" => "Faraday v0.11.0" + }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) stub_request(:get, "https://kentshikama.com/api/openid_connect/jwks.json") - .with(headers: {"Accept" => "*/*", - "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.9.2"}) + .with(headers: { + "Accept" => "*/*", + "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", + "User-Agent" => "Faraday v0.11.0" + }) .to_return(status: 200, body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {}) post :create, redirect_uris: ["http://localhost"], client_name: "diaspora client",