From f1065c8127848d2687679d1572ec74aa754fc3a4 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 09:24:20 +0200 Subject: [PATCH 01/31] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 946973ab1..0a4fe57a6 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ group :postgresql, optional: true do end -gem "activerecord-import", "0.13.0" +gem "activerecord-import", "0.15.0" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index 72f632412..6d27df2f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,8 +34,8 @@ GEM activemodel (= 4.2.7.1) activesupport (= 4.2.7.1) arel (~> 6.0) - activerecord-import (0.13.0) - activerecord (>= 3.0) + activerecord-import (0.15.0) + activerecord (>= 3.2) activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -913,7 +913,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.5) - activerecord-import (= 0.13.0) + activerecord-import (= 0.15.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) addressable (= 2.3.8) From 9d02c6595dd970a49d6233213a2e0b0aef303d9f Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 09:25:56 +0200 Subject: [PATCH 02/31] Bump acts_as_api --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0a4fe57a6..0fad9ef10 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "diaspora_federation-rails", "0.1.3" # API and JSON -gem "acts_as_api", "0.4.2" +gem "acts_as_api", "0.4.3" gem "json", "1.8.3" gem "json-schema", "2.6.2" diff --git a/Gemfile.lock b/Gemfile.lock index 6d27df2f6..a00944254 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,7 +44,7 @@ GEM tzinfo (~> 1.1) acts-as-taggable-on (3.5.0) activerecord (>= 3.2, < 5) - acts_as_api (0.4.2) + acts_as_api (0.4.3) activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) @@ -915,7 +915,7 @@ DEPENDENCIES active_model_serializers (= 0.9.5) activerecord-import (= 0.15.0) acts-as-taggable-on (= 3.5.0) - acts_as_api (= 0.4.2) + acts_as_api (= 0.4.3) addressable (= 2.3.8) asset_sync (= 1.1.0) autoprefixer-rails (= 6.3.6.2) From 791c8f3fc4efd9bf5fbf078b4ae0bf803a4d45a1 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 09:43:17 +0200 Subject: [PATCH 03/31] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0fad9ef10..5f1433adc 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" gem "bootstrap-sass", "3.3.6" gem "compass-rails", "2.0.5" gem "sass-rails", "5.0.4" -gem "autoprefixer-rails", "6.3.6.2" +gem "autoprefixer-rails", "6.4.0.2" gem "bootstrap-switch-rails", "3.3.3" # Database diff --git a/Gemfile.lock b/Gemfile.lock index a00944254..97b70e92a 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.3.6.2) + autoprefixer-rails (6.4.0.2) execjs backbone-on-rails (1.2.0.0) eco @@ -918,7 +918,7 @@ DEPENDENCIES acts_as_api (= 0.4.3) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 6.3.6.2) + autoprefixer-rails (= 6.4.0.2) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 3.3.6) bootstrap-switch-rails (= 3.3.3) From 415713b6d30c56e265ae93ed8a9e51974126292b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 09:51:49 +0200 Subject: [PATCH 04/31] Bump bootstrap-rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 5f1433adc..897f43d01 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" # CSS -gem "bootstrap-sass", "3.3.6" +gem "bootstrap-sass", "3.3.7" gem "compass-rails", "2.0.5" gem "sass-rails", "5.0.4" gem "autoprefixer-rails", "6.4.0.2" diff --git a/Gemfile.lock b/Gemfile.lock index 97b70e92a..605a9817f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM railties bcrypt (3.1.11) bindata (2.3.0) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap-switch-rails (3.3.3) @@ -646,8 +646,8 @@ GEM sprockets-rails rails-assets-autosize (3.0.15) rails-assets-blueimp-gallery (2.21.2) - rails-assets-bootstrap (3.3.6) - rails-assets-jquery (>= 1.9.1, < 3) + rails-assets-bootstrap (3.3.7) + rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.9.0) rails-assets-bootstrap (~> 3) rails-assets-diaspora_jsxc (0.1.5.develop.1) @@ -920,7 +920,7 @@ DEPENDENCIES asset_sync (= 1.1.0) autoprefixer-rails (= 6.4.0.2) backbone-on-rails (= 1.2.0.0) - bootstrap-sass (= 3.3.6) + bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) capybara (= 2.7.1) carrierwave (= 0.11.2) From 36910095fd1922a9e3d4a8c1954a111efa0cdf86 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 09:56:42 +0200 Subject: [PATCH 05/31] Bump fuubar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 897f43d01..8eef2c44c 100644 --- a/Gemfile +++ b/Gemfile @@ -268,7 +268,7 @@ group :test do # RSpec (unit tests, some integration tests) gem "fixture_builder", "0.4.1" - gem "fuubar", "2.0.0" + gem "fuubar", "2.1.1" gem "test_after_commit", "1.0.0" # Cucumber (integration tests) diff --git a/Gemfile.lock b/Gemfile.lock index 605a9817f..ed7dbb3b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -365,7 +365,7 @@ GEM font-awesome-rails (4.6.3.0) railties (>= 3.2, < 5.1) formatador (0.2.5) - fuubar (2.0.0) + fuubar (2.1.1) rspec (~> 3.0) ruby-progressbar (~> 1.4) get_process_mem (0.2.0) @@ -944,7 +944,7 @@ DEPENDENCIES faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) fog (= 1.38.0) - fuubar (= 2.0.0) + fuubar (= 2.1.1) gon (= 6.0.1) guard (= 2.14.0) guard-cucumber (= 2.1.2) From a5e4d11f7b9ed6f5df6b61377063c6320a1c625a Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 09:58:12 +0200 Subject: [PATCH 06/31] Bump gon --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8eef2c44c..a2b13eec3 100644 --- a/Gemfile +++ b/Gemfile @@ -172,7 +172,7 @@ gem "typhoeus", "1.0.2" # Views -gem "gon", "6.0.1" +gem "gon", "6.1.0" gem "hamlit", "2.5.0" gem "mobile-fu", "1.3.1" gem "will_paginate", "3.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index ed7dbb3b8..49364d213 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -375,7 +375,7 @@ GEM terminal-table globalid (0.3.7) activesupport (>= 4.1.0) - gon (6.0.1) + gon (6.1.0) actionpack (>= 3.0) json multi_json @@ -945,7 +945,7 @@ DEPENDENCIES fixture_builder (= 0.4.1) fog (= 1.38.0) fuubar (= 2.1.1) - gon (= 6.0.1) + gon (= 6.1.0) guard (= 2.14.0) guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) From a76dd9c6ca44a31f14bf58ead226927fb75c40c4 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 09:59:47 +0200 Subject: [PATCH 07/31] Bump haml_lint --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a2b13eec3..849b4fdfa 100644 --- a/Gemfile +++ b/Gemfile @@ -241,7 +241,7 @@ group :development do # Linters gem "rubocop", "0.40.0" - gem "haml_lint", "0.17.1" + gem "haml_lint", "0.18.1" 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 49364d213..dc0ad59a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -403,7 +403,7 @@ GEM rubocop (~> 0.20) haml (4.0.7) tilt - haml_lint (0.17.1) + haml_lint (0.18.1) haml (~> 4.0) rake (>= 10, < 12) rubocop (>= 0.36.0) @@ -950,7 +950,7 @@ DEPENDENCIES guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.2.0) - haml_lint (= 0.17.1) + haml_lint (= 0.18.1) hamlit (= 2.5.0) handlebars_assets (= 0.23.0) http_accept_language (= 2.0.5) From 957da66aa0670014df9a6756281256dbbc9252f5 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:01:04 +0200 Subject: [PATCH 08/31] Bump handlebars_assets --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 849b4fdfa..edb8a23ae 100644 --- a/Gemfile +++ b/Gemfile @@ -89,7 +89,7 @@ gem "entypo-rails", "3.0.0.pre.rc2" # JavaScript gem "backbone-on-rails", "1.2.0.0" -gem "handlebars_assets", "0.23.0" +gem "handlebars_assets", "0.23.1" gem "jquery-rails", "4.1.1" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index dc0ad59a6..d6de3d652 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -412,7 +412,7 @@ GEM temple (~> 0.7.6) thor tilt - handlebars_assets (0.23.0) + handlebars_assets (0.23.1) execjs (~> 2.0) multi_json (~> 1.0) sprockets (>= 2.0.0) @@ -952,7 +952,7 @@ DEPENDENCIES guard-rubocop (= 1.2.0) haml_lint (= 0.18.1) hamlit (= 2.5.0) - handlebars_assets (= 0.23.0) + handlebars_assets (= 0.23.1) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) jasmine (= 2.4.0) From a01764278aed9051f1ce711db2967a50cd4e029c Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:05:46 +0200 Subject: [PATCH 09/31] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index edb8a23ae..fbbd23bec 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ gem "handlebars_assets", "0.23.1" gem "jquery-rails", "4.1.1" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.1.0" -gem "js-routes", "1.2.6" +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 diff --git a/Gemfile.lock b/Gemfile.lock index d6de3d652..ff9037c87 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -457,7 +457,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.2.6) + js-routes (1.2.9) railties (>= 3.2) sprockets-rails js_image_paths (0.1.0) @@ -959,7 +959,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.1.1) jquery-ui-rails (= 5.0.5) - js-routes (= 1.2.6) + js-routes (= 1.2.9) js_image_paths (= 0.1.0) json (= 1.8.3) json-schema (= 2.6.2) From 0fbddbe8f860ed7301eb4fd88210a90542762f98 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:13:26 +0200 Subject: [PATCH 10/31] Bump omniauth-facebook --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index fbbd23bec..250fcc32b 100644 --- a/Gemfile +++ b/Gemfile @@ -141,7 +141,7 @@ gem "open_graph_reader", "0.6.1" # Services gem "omniauth", "1.3.1" -gem "omniauth-facebook", "3.0.0" +gem "omniauth-facebook", "4.0.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.2.1" gem "twitter", "5.16.0" diff --git a/Gemfile.lock b/Gemfile.lock index ff9037c87..03cae007d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -476,7 +476,7 @@ GEM rspec (>= 2.0, < 4.0) jsonpath (0.5.8) multi_json - jwt (1.5.1) + jwt (1.5.4) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -529,9 +529,9 @@ GEM nenv (~> 0.1) shellany (~> 0.0) oauth (0.5.1) - oauth2 (1.1.0) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0, < 1.5.2) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) @@ -540,7 +540,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-facebook (3.0.0) + omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-oauth (1.1.0) oauth @@ -973,7 +973,7 @@ DEPENDENCIES mysql2 (= 0.4.4) nokogiri (= 1.6.8) omniauth (= 1.3.1) - omniauth-facebook (= 3.0.0) + omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.2.1) omniauth-wordpress (= 0.2.2) From e2cc9f9c24b07d274799b11ae2b109d8587b306b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:15:47 +0200 Subject: [PATCH 11/31] Bump openid_connect --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 250fcc32b..6ad5ae729 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ gem "twitter", "5.16.0" gem "omniauth-wordpress", "0.2.2" # OpenID Connect -gem "openid_connect", "0.11.2" +gem "openid_connect", "0.12.0" # Serializers diff --git a/Gemfile.lock b/Gemfile.lock index 03cae007d..1c597bf08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ GEM jquery-rails railties bcrypt (3.1.11) - bindata (2.3.0) + bindata (2.3.1) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) @@ -434,7 +434,7 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.0) + httpclient (2.8.1) i18n (0.7.0) i18n-inflector (2.6.7) i18n (>= 0.4.1) @@ -463,7 +463,7 @@ GEM js_image_paths (0.1.0) rails (~> 4.0) json (1.8.3) - json-jwt (1.5.2) + json-jwt (1.6.3) activesupport bindata multi_json (>= 1.3) @@ -559,12 +559,12 @@ GEM open_graph_reader (0.6.1) faraday (~> 0.9.0) nokogiri (~> 1.6) - openid_connect (0.11.2) + openid_connect (0.12.0) activemodel attr_required (>= 1.0.0) json (>= 1.4.3) json-jwt (>= 1.5.0) - rack-oauth2 (>= 1.2.1) + rack-oauth2 (>= 1.3.1) swd (>= 1.0.0) tzinfo validate_email @@ -616,7 +616,7 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.3.0) + rack-oauth2 (1.4.0) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -978,7 +978,7 @@ DEPENDENCIES omniauth-twitter (= 1.2.1) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.1) - openid_connect (= 0.11.2) + openid_connect (= 0.12.0) pg (= 0.18.4) poltergeist (= 1.10.0) pronto (= 0.7.0) From d4a700d93941a14ab38f557699f1b8edb38e98dc Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:18:01 +0200 Subject: [PATCH 12/31] Bump autosize --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6ad5ae729..0534ce5db 100644 --- a/Gemfile +++ b/Gemfile @@ -113,7 +113,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.11" - gem "rails-assets-autosize", "3.0.15" + gem "rails-assets-autosize", "3.0.17" gem "rails-assets-blueimp-gallery", "2.21.2" end diff --git a/Gemfile.lock b/Gemfile.lock index 1c597bf08..a862d1c4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -644,7 +644,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.7.1) sprockets-rails - rails-assets-autosize (3.0.15) + rails-assets-autosize (3.0.17) rails-assets-blueimp-gallery (2.21.2) rails-assets-bootstrap (3.3.7) rails-assets-jquery (>= 1.9.1, < 4) @@ -996,7 +996,7 @@ DEPENDENCIES rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) rails (= 4.2.7.1) - rails-assets-autosize (= 3.0.15)! + rails-assets-autosize (= 3.0.17)! rails-assets-blueimp-gallery (= 2.21.2)! rails-assets-bootstrap-markdown (= 2.9.0)! rails-assets-diaspora_jsxc (= 0.1.5.develop.1)! From 1148e3a839119197f48c9289bc5b2fbed5bf9d8b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:19:02 +0200 Subject: [PATCH 13/31] Bump blueimp-gallery --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0534ce5db..a734e36a6 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.11" gem "rails-assets-autosize", "3.0.17" - gem "rails-assets-blueimp-gallery", "2.21.2" + gem "rails-assets-blueimp-gallery", "2.21.3" end # Localization diff --git a/Gemfile.lock b/Gemfile.lock index a862d1c4b..2ff091e53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -645,7 +645,7 @@ GEM railties (= 4.2.7.1) sprockets-rails rails-assets-autosize (3.0.17) - rails-assets-blueimp-gallery (2.21.2) + rails-assets-blueimp-gallery (2.21.3) rails-assets-bootstrap (3.3.7) rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.9.0) @@ -997,7 +997,7 @@ DEPENDENCIES rack-ssl (= 1.4.1) rails (= 4.2.7.1) rails-assets-autosize (= 3.0.17)! - rails-assets-blueimp-gallery (= 2.21.2)! + rails-assets-blueimp-gallery (= 2.21.3)! rails-assets-bootstrap-markdown (= 2.9.0)! rails-assets-diaspora_jsxc (= 0.1.5.develop.1)! rails-assets-highlightjs (= 9.4.0)! From f71d5c472b8c7e51e1beeeddfe9ec1bf17d21702 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:21:20 +0200 Subject: [PATCH 14/31] Bump bootstrap-markdown --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a734e36a6..c25db8259 100644 --- a/Gemfile +++ b/Gemfile @@ -106,7 +106,7 @@ source "https://rails-assets.org" do gem "rails-assets-markdown-it-sub", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0" gem "rails-assets-highlightjs", "9.4.0" - gem "rails-assets-bootstrap-markdown", "2.9.0" + gem "rails-assets-bootstrap-markdown", "2.10.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 2ff091e53..466c8a38c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -648,7 +648,7 @@ GEM rails-assets-blueimp-gallery (2.21.3) rails-assets-bootstrap (3.3.7) rails-assets-jquery (>= 1.9.1, < 4) - rails-assets-bootstrap-markdown (2.9.0) + rails-assets-bootstrap-markdown (2.10.0) rails-assets-bootstrap (~> 3) rails-assets-diaspora_jsxc (0.1.5.develop.1) rails-assets-favico.js (~> 0.3.9) @@ -998,7 +998,7 @@ DEPENDENCIES rails (= 4.2.7.1) rails-assets-autosize (= 3.0.17)! rails-assets-blueimp-gallery (= 2.21.3)! - rails-assets-bootstrap-markdown (= 2.9.0)! + rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-diaspora_jsxc (= 0.1.5.develop.1)! rails-assets-highlightjs (= 9.4.0)! rails-assets-jasmine-ajax (= 3.2.0)! From be4d7c9a437bf2325c6deebce0d2cf253e56bd60 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:22:22 +0200 Subject: [PATCH 15/31] Bump highlightjs --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c25db8259..9cc6e7ab6 100644 --- a/Gemfile +++ b/Gemfile @@ -105,7 +105,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.4.0" + gem "rails-assets-highlightjs", "9.6.0" gem "rails-assets-bootstrap-markdown", "2.10.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 466c8a38c..39a64a8f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -658,7 +658,7 @@ GEM rails-assets-jquery.slimscroll (~> 1.3.6) rails-assets-jquery.ui (~> 1.11.4) rails-assets-favico.js (0.3.10) - rails-assets-highlightjs (9.4.0) + rails-assets-highlightjs (9.6.0) rails-assets-jasmine (2.4.1) rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine (~> 2) @@ -1000,7 +1000,7 @@ DEPENDENCIES rails-assets-blueimp-gallery (= 2.21.3)! rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-diaspora_jsxc (= 0.1.5.develop.1)! - rails-assets-highlightjs (= 9.4.0)! + rails-assets-highlightjs (= 9.6.0)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jquery (= 2.2.1)! rails-assets-jquery-placeholder (= 2.3.1)! From 5dd6e143eac413f123478ca46b81555e2053f731 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:23:20 +0200 Subject: [PATCH 16/31] Bump markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9cc6e7ab6..9bfd1c15e 100644 --- a/Gemfile +++ b/Gemfile @@ -98,7 +98,7 @@ 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-markdown-it", "6.0.5" + gem "rails-assets-markdown-it", "7.0.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "0.4.0" gem "rails-assets-markdown-it-sanitizer", "0.4.2" diff --git a/Gemfile.lock b/Gemfile.lock index 39a64a8f6..9a230b0f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -674,7 +674,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 (6.0.5) + rails-assets-markdown-it (7.0.0) rails-assets-markdown-it-diaspora-mention (0.4.0) rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-sanitizer (0.4.2) @@ -1005,7 +1005,7 @@ DEPENDENCIES rails-assets-jquery (= 2.2.1)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! - rails-assets-markdown-it (= 6.0.5)! + rails-assets-markdown-it (= 7.0.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 0.4.0)! rails-assets-markdown-it-hashtag (= 0.4.0)! From beab9e99257b46d76122cee32cc136680a03812b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:25:50 +0200 Subject: [PATCH 17/31] Bump markdown-it-diaspora-mention --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9bfd1c15e..25fbc7f26 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ source "https://rails-assets.org" do gem "rails-assets-markdown-it", "7.0.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" - gem "rails-assets-markdown-it-diaspora-mention", "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--markdown-it-for-inline", "0.1.1" gem "rails-assets-markdown-it-sub", "1.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index 9a230b0f5..ca6f25244 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -675,7 +675,7 @@ GEM 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-diaspora-mention (0.4.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-sub (1.0.0) @@ -1007,7 +1007,7 @@ DEPENDENCIES rails-assets-jquery-textchange (= 0.2.3)! rails-assets-markdown-it (= 7.0.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! - rails-assets-markdown-it-diaspora-mention (= 0.4.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-sub (= 1.0.0)! From 30fb58a3dffad0b59ecd83cfc9dc06f00c84a728 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:27:08 +0200 Subject: [PATCH 18/31] Bump perfect-scrollbar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 25fbc7f26..07b33ac2f 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.11" + gem "rails-assets-perfect-scrollbar", "0.6.12" gem "rails-assets-autosize", "3.0.17" gem "rails-assets-blueimp-gallery", "2.21.3" end diff --git a/Gemfile.lock b/Gemfile.lock index ca6f25244..a794ed64f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -680,7 +680,7 @@ GEM rails-assets-markdown-it-sanitizer (0.4.2) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-perfect-scrollbar (0.6.11) + rails-assets-perfect-scrollbar (0.6.12) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -1012,7 +1012,7 @@ DEPENDENCIES rails-assets-markdown-it-sanitizer (= 0.4.2)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-perfect-scrollbar (= 0.6.11)! + rails-assets-perfect-scrollbar (= 0.6.12)! rails-i18n (= 4.0.8) rails-timeago (= 2.11.0) rails_admin (= 0.8.1) From 21712f7c8f04f199e89e3a124f1bd493358fcf8a Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:31:23 +0200 Subject: [PATCH 19/31] Bump sass-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 07b33ac2f..163bdef69 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,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.4" +gem "sass-rails", "5.0.6" gem "autoprefixer-rails", "6.4.0.2" gem "bootstrap-switch-rails", "3.3.3" diff --git a/Gemfile.lock b/Gemfile.lock index a794ed64f..c0d6a74c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -767,8 +767,8 @@ GEM rugged (0.24.0) safe_yaml (1.0.4) sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) @@ -1025,7 +1025,7 @@ DEPENDENCIES rubocop (= 0.40.0) ruby-oembed (= 0.10.1) rubyzip (= 1.2.0) - sass-rails (= 5.0.4) + sass-rails (= 5.0.6) shoulda-matchers (= 3.1.1) sidekiq (= 4.1.4) sidekiq-cron (= 0.4.2) From 2ba6ed0b48e39531b4dd0ee45e28ef1437eadddb Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:34:36 +0200 Subject: [PATCH 20/31] Bump spring --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 163bdef69..21c7d21e4 100644 --- a/Gemfile +++ b/Gemfile @@ -250,7 +250,7 @@ group :development do # Preloading environment - gem "spring", "1.7.1" + gem "spring", "1.7.2" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index c0d6a74c3..ed88a5083 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -808,7 +808,7 @@ GEM sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) - spring (1.7.1) + spring (1.7.2) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.4) @@ -1033,7 +1033,7 @@ DEPENDENCIES simplecov (= 0.12.0) sinatra (= 1.4.7) sinon-rails (= 1.15.0) - spring (= 1.7.1) + spring (= 1.7.2) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 1.0.0) From 3afc998b2d73698ca307e8ec0a7791129222b645 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:35:53 +0200 Subject: [PATCH 21/31] Bump test_after_commit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 21c7d21e4..a322ccc62 100644 --- a/Gemfile +++ b/Gemfile @@ -269,7 +269,7 @@ group :test do gem "fixture_builder", "0.4.1" gem "fuubar", "2.1.1" - gem "test_after_commit", "1.0.0" + gem "test_after_commit", "1.1.0" # Cucumber (integration tests) diff --git a/Gemfile.lock b/Gemfile.lock index ed88a5083..31dff6c87 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -835,7 +835,7 @@ GEM term-ansicolor (1.3.2) tins (~> 1.0) terminal-table (1.6.0) - test_after_commit (1.0.0) + test_after_commit (1.1.0) activerecord (>= 3.2) thor (0.19.1) thread_safe (0.3.5) @@ -1036,7 +1036,7 @@ DEPENDENCIES spring (= 1.7.2) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) - test_after_commit (= 1.0.0) + test_after_commit (= 1.1.0) timecop (= 0.8.1) turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) From 0f5ab81d0b0c6428e8317da63596854d37e2bff8 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:37:59 +0200 Subject: [PATCH 22/31] Bump twitter-text --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a322ccc62..88fac00c7 100644 --- a/Gemfile +++ b/Gemfile @@ -134,7 +134,7 @@ gem "leaflet-rails", "0.7.7" gem "nokogiri", "1.6.8" gem "redcarpet", "3.3.4" -gem "twitter-text", "1.13.4" +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 31dff6c87..68007747d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -857,7 +857,7 @@ GEM memoizable (~> 0.4.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - twitter-text (1.13.4) + twitter-text (1.14.0) unf (~> 0.1.0) typhoeus (1.0.2) ethon (>= 0.9.0) @@ -1040,7 +1040,7 @@ DEPENDENCIES timecop (= 0.8.1) turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) - twitter-text (= 1.13.4) + twitter-text (= 1.14.0) typhoeus (= 1.0.2) uglifier (= 3.0.0) unicorn (= 5.1.0) From 3691bba100d32aab25e4073ec8e4a30e11511895 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:39:35 +0200 Subject: [PATCH 23/31] Bump typhoeus --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 88fac00c7..7ea75ce49 100644 --- a/Gemfile +++ b/Gemfile @@ -168,7 +168,7 @@ gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.2" gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" -gem "typhoeus", "1.0.2" +gem "typhoeus", "1.1.0" # Views diff --git a/Gemfile.lock b/Gemfile.lock index 68007747d..8e786755e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -859,7 +859,7 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.14.0) unf (~> 0.1.0) - typhoeus (1.0.2) + typhoeus (1.1.0) ethon (>= 0.9.0) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -1041,7 +1041,7 @@ DEPENDENCIES turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) twitter-text (= 1.14.0) - typhoeus (= 1.0.2) + typhoeus (= 1.1.0) uglifier (= 3.0.0) unicorn (= 5.1.0) unicorn-worker-killer (= 0.4.4) From 7e3d770572bca751b8e3aeb091848f61e530677d Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:41:09 +0200 Subject: [PATCH 24/31] Bump uglifier --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7ea75ce49..6df2cfe69 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ gem "sidekiq-cron", "0.4.2" # Compression -gem "uglifier", "3.0.0" +gem "uglifier", "3.0.1" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index 8e786755e..746faa0d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -863,7 +863,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (3.0.1) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -1042,7 +1042,7 @@ DEPENDENCIES twitter (= 5.16.0) twitter-text (= 1.14.0) typhoeus (= 1.1.0) - uglifier (= 3.0.0) + uglifier (= 3.0.1) unicorn (= 5.1.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) From 61f6966fc441cd118f0f3b21e21d76cff61c4415 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:47:52 +0200 Subject: [PATCH 25/31] Bump celluloid-supervision --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 746faa0d1..59cd68935 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,7 +104,7 @@ GEM timers (>= 4.1.1) celluloid-pool (0.20.5) timers (>= 4.1.1) - celluloid-supervision (0.20.5) + celluloid-supervision (0.20.6) timers (>= 4.1.1) chunky_png (1.3.5) cliver (0.3.2) From 163fc98e201d5d92ffb6839d93d28f2669aaa8bf Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:50:45 +0200 Subject: [PATCH 26/31] Bump chunky_png --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 59cd68935..940dc52f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM timers (>= 4.1.1) celluloid-supervision (0.20.6) timers (>= 4.1.1) - chunky_png (1.3.5) + chunky_png (1.3.6) cliver (0.3.2) coderay (1.1.1) coffee-rails (4.1.1) From 0a56e409dc6403c7eb2aca8fb4cc18f91b84712b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:51:37 +0200 Subject: [PATCH 27/31] Bump coffee-rails --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 940dc52f9..15a50d2e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,9 +109,9 @@ GEM chunky_png (1.3.6) cliver (0.3.2) coderay (1.1.1) - coffee-rails (4.1.1) + coffee-rails (4.2.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0, < 5.2.x) coffee-script (2.4.1) coffee-script-source execjs From d2725b11ddf9833a15d1d971930d09127b941e93 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 10:54:05 +0200 Subject: [PATCH 28/31] Bump domain_name --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 15a50d2e0..329feb37e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,7 +191,7 @@ GEM factory_girl (~> 4.7) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160310) + domain_name (0.5.20160615) unf (>= 0.0.5, < 1.0.0) eco (1.0.0) coffee-script From 04dc3be21a1f63b1cd50fc971009f01610edecd1 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 11:00:01 +0200 Subject: [PATCH 29/31] Bump font-awesome-rails --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 329feb37e..8428b39cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -362,7 +362,7 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.0) + font-awesome-rails (4.6.3.1) railties (>= 3.2, < 5.1) formatador (0.2.5) fuubar (2.1.1) From cea77f5f74eb2de55d0b9a8562b1d731dfe3573e Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 11:01:21 +0200 Subject: [PATCH 30/31] Bump get_process_mem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8428b39cf..8b1df56b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -368,7 +368,7 @@ GEM fuubar (2.1.1) rspec (~> 3.0) ruby-progressbar (~> 1.4) - get_process_mem (0.2.0) + get_process_mem (0.2.1) gherkin (4.0.0) gitlab (3.6.1) httparty From 7c6cbf364c6f0765acea9d58212c65f340d3ff83 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 11:09:00 +0200 Subject: [PATCH 31/31] Bump jquery.slimscroll --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8b1df56b4..577595f56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -670,7 +670,7 @@ GEM rails-assets-jquery (>= 1.6) rails-assets-jquery-textchange (0.2.3) rails-assets-jquery - rails-assets-jquery.slimscroll (1.3.7) + rails-assets-jquery.slimscroll (1.3.8) rails-assets-jquery.ui (1.11.4) rails-assets-jquery (>= 1.6) rails-assets-markdown-it--markdown-it-for-inline (0.1.1)