From 032e292e82a0098cb6861cec25a0486e547058d2 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sat, 18 Jul 2015 18:21:27 +0200 Subject: [PATCH 1/6] Update markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 22408ed0e..d1dfeaac6 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ gem "js-routes", "1.0.1" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails - gem "rails-assets-markdown-it", "4.3.0" + gem "rails-assets-markdown-it", "4.4.0" gem "rails-assets-markdown-it-hashtag", "0.3.1" gem "rails-assets-markdown-it-diaspora-mention", "0.3.0" gem "rails-assets-markdown-it-sanitizer", "0.3.1" diff --git a/Gemfile.lock b/Gemfile.lock index 3c87d1f6e..9efbfa144 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -546,7 +546,7 @@ GEM rails-assets-jquery.slimscroll (1.3.6) rails-assets-jquery (>= 1.7) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) - rails-assets-markdown-it (4.3.0) + rails-assets-markdown-it (4.4.0) rails-assets-markdown-it-diaspora-mention (0.3.0) rails-assets-markdown-it-hashtag (0.3.1) rails-assets-markdown-it-sanitizer (0.3.1) @@ -829,7 +829,7 @@ DEPENDENCIES rails-assets-jquery-simulate (= 1.0.1)! rails-assets-jquery-simulate-ext (= 1.3.0)! rails-assets-jquery-textchange (= 0.2.3)! - rails-assets-markdown-it (= 4.3.0)! + rails-assets-markdown-it (= 4.4.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 0.3.0)! rails-assets-markdown-it-hashtag (= 0.3.1)! From 60e3b0c55febd98d8a405c981f038e3e0e16f991 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sat, 18 Jul 2015 18:23:41 +0200 Subject: [PATCH 2/6] Update highlightjs --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d1dfeaac6..15cc120a8 100644 --- a/Gemfile +++ b/Gemfile @@ -99,7 +99,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", "8.5.0" + gem "rails-assets-highlightjs", "8.6.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 9efbfa144..199cc0e07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -521,7 +521,7 @@ GEM rails-assets-jquery-fullscreen (~> 1.1.4) rails-assets-jquery-ui (~> 1.10.4) rails-assets-jquery.slimscroll (~> 1.3.3) - rails-assets-highlightjs (8.5.0) + rails-assets-highlightjs (8.6.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) rails-assets-jasmine (2.3.4) @@ -819,7 +819,7 @@ DEPENDENCIES rails (= 4.2.3) rails-assets-autosize (= 3.0.6)! rails-assets-diaspora_jsxc (~> 0.1.1)! - rails-assets-highlightjs (= 8.5.0)! + rails-assets-highlightjs (= 8.6.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.1.1)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! From 7a8269ce053423fd2b270606b8982dfdba5dc80f Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sat, 18 Jul 2015 18:27:18 +0200 Subject: [PATCH 3/6] Update jquery-placeholder --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 15cc120a8..92972c864 100644 --- a/Gemfile +++ b/Gemfile @@ -105,7 +105,7 @@ source "https://rails-assets.org" do gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" gem "rails-assets-jquery-idletimer", "1.0.1" - gem "rails-assets-jquery-placeholder", "2.1.1" + gem "rails-assets-jquery-placeholder", "2.1.2" gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-perfect-scrollbar", "0.6.2" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" diff --git a/Gemfile.lock b/Gemfile.lock index 199cc0e07..fa35378bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -534,7 +534,7 @@ GEM rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen (1.1.4) rails-assets-jquery-idletimer (1.0.1) - rails-assets-jquery-placeholder (2.1.1) + rails-assets-jquery-placeholder (2.1.2) rails-assets-jquery (>= 1.6) rails-assets-jquery-simulate (1.0.1) rails-assets-jquery-simulate-ext (1.3.0) @@ -825,7 +825,7 @@ DEPENDENCIES rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jquery (= 1.11.2)! rails-assets-jquery-idletimer (= 1.0.1)! - rails-assets-jquery-placeholder (= 2.1.1)! + rails-assets-jquery-placeholder (= 2.1.2)! rails-assets-jquery-simulate (= 1.0.1)! rails-assets-jquery-simulate-ext (= 1.3.0)! rails-assets-jquery-textchange (= 0.2.3)! From aa7557281535164d844e21f0c519aea3edc87057 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sat, 18 Jul 2015 18:29:05 +0200 Subject: [PATCH 4/6] Update perfect-scrollbar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 92972c864..4ff819297 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ source "https://rails-assets.org" do gem "rails-assets-jquery-idletimer", "1.0.1" gem "rails-assets-jquery-placeholder", "2.1.2" gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.2" + gem "rails-assets-perfect-scrollbar", "0.6.3" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" end diff --git a/Gemfile.lock b/Gemfile.lock index fa35378bf..d494fc9c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -552,7 +552,7 @@ GEM rails-assets-markdown-it-sanitizer (0.3.1) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-perfect-scrollbar (0.6.2) + rails-assets-perfect-scrollbar (0.6.3) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.6) @@ -836,7 +836,7 @@ DEPENDENCIES rails-assets-markdown-it-sanitizer (= 0.3.1)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-perfect-scrollbar (= 0.6.2)! + rails-assets-perfect-scrollbar (= 0.6.3)! rails-i18n (= 4.0.4) rails-timeago (= 2.11.0) rails_admin (= 0.6.8) From cf4143f4a1101713ecf58aca2fdaaf3a4ac25261 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sat, 18 Jul 2015 18:46:47 +0200 Subject: [PATCH 5/6] Remove jquery-idletimer --- Gemfile | 1 - Gemfile.lock | 2 -- app/assets/javascripts/main.js | 1 - 3 files changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index 4ff819297..4aacb0e4b 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,6 @@ source "https://rails-assets.org" do # jQuery plugins gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" - gem "rails-assets-jquery-idletimer", "1.0.1" gem "rails-assets-jquery-placeholder", "2.1.2" gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-perfect-scrollbar", "0.6.3" diff --git a/Gemfile.lock b/Gemfile.lock index d494fc9c2..b52f1a36d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -533,7 +533,6 @@ GEM rails-assets-jquery-colorbox (1.5.15) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen (1.1.4) - rails-assets-jquery-idletimer (1.0.1) rails-assets-jquery-placeholder (2.1.2) rails-assets-jquery (>= 1.6) rails-assets-jquery-simulate (1.0.1) @@ -824,7 +823,6 @@ DEPENDENCIES rails-assets-jasmine-ajax (= 3.1.1)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jquery (= 1.11.2)! - rails-assets-jquery-idletimer (= 1.0.1)! rails-assets-jquery-placeholder (= 2.1.2)! rails-assets-jquery-simulate (= 1.0.1)! rails-assets-jquery-simulate-ext (= 1.3.0)! diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 58f9db688..5fe54a767 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -17,7 +17,6 @@ //= require jquery.events.input //= require jakobmattsson-jquery-elastic //= require jquery.mentionsInput -//= require jquery-idletimer/dist/idle-timer //= require jquery.infinitescroll-custom //= require jquery.autocomplete-custom //= require jquery-ui/core From b707ec9622d444584a29feabf006728c2c6d59f6 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 20 Jul 2015 01:40:35 +0200 Subject: [PATCH 6/6] Update jasmine-ajax --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4aacb0e4b..03acee597 100644 --- a/Gemfile +++ b/Gemfile @@ -285,7 +285,7 @@ group :development, :test do # Jasmine (client side application tests (JS)) gem "jasmine", "2.2.0" gem "jasmine-jquery-rails", "2.0.3" - gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org" + gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" # silence assets diff --git a/Gemfile.lock b/Gemfile.lock index b52f1a36d..703cbebda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -525,7 +525,7 @@ GEM rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) rails-assets-jasmine (2.3.4) - rails-assets-jasmine-ajax (3.1.1) + rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine (~> 2) rails-assets-jeresig--jquery.hotkeys (0.2.0) rails-assets-jquery (>= 1.4.2) @@ -820,7 +820,7 @@ DEPENDENCIES rails-assets-diaspora_jsxc (~> 0.1.1)! rails-assets-highlightjs (= 8.6.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! - rails-assets-jasmine-ajax (= 3.1.1)! + rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jquery (= 1.11.2)! rails-assets-jquery-placeholder (= 2.1.2)!