From 5995afbd36c36727c303dd1965db0b8457f94215 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 20:10:58 +0100 Subject: [PATCH 01/10] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c79ef9d88..8a8ad5e86 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" gem "bootstrap-sass", "2.3.2.2" gem "compass-rails", "2.0.5" gem "sass-rails", "5.0.4" -gem "autoprefixer-rails", "6.2.2" +gem "autoprefixer-rails", "6.3.1" # Database diff --git a/Gemfile.lock b/Gemfile.lock index 1ca3e7bc3..6c016e257 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (6.2.2) + autoprefixer-rails (6.3.1) execjs json backbone-on-rails (1.2.0.0) @@ -779,7 +779,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 6.2.2) + autoprefixer-rails (= 6.3.1) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) capybara (= 2.5.0) From 3782935b19b880069901c86ddceceba6e44920ab Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 20:19:08 +0100 Subject: [PATCH 02/10] Bump devise --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 8a8ad5e86..33af5e093 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem "json-schema", "2.5.2" # Authentication -gem "devise", "3.5.4" +gem "devise", "3.5.5" gem "devise_lastseenable", "0.0.6" gem "devise-token_authenticatable", "~> 0.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 6c016e257..e7d498eb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,7 +131,7 @@ GEM nokogiri (~> 1.5) rails (>= 3, < 5) database_cleaner (1.5.1) - devise (3.5.4) + devise (3.5.5) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -757,7 +757,7 @@ GEM uuid (2.3.8) macaddr (~> 1.0) valid (1.1.0) - warden (1.2.4) + warden (1.2.6) rack (>= 1.0) webmock (1.22.3) addressable (>= 2.3.6) @@ -788,7 +788,7 @@ DEPENDENCIES configurate (= 0.3.1) cucumber-rails (= 1.4.2) database_cleaner (= 1.5.1) - devise (= 3.5.4) + devise (= 3.5.5) devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.2.0.develop) From ce8e8716b927f94ac0731f7468e2e03607c05bb2 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 20:24:27 +0100 Subject: [PATCH 03/10] Bump handlebars_assets --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 33af5e093..c470c00d6 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,7 @@ gem "entypo-rails", "2.2.3" # JavaScript gem "backbone-on-rails", "1.2.0.0" -gem "handlebars_assets", "0.22.0" +gem "handlebars_assets", "0.23.0" gem "jquery-rails", "4.0.5" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.0.2" diff --git a/Gemfile.lock b/Gemfile.lock index e7d498eb5..3ef826898 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -361,11 +361,11 @@ GEM rubocop (~> 0.20) haml (4.0.7) tilt - handlebars_assets (0.22.0) + handlebars_assets (0.23.0) execjs (~> 2.0) multi_json (~> 1.0) - sprockets (>= 2.0.0, < 4.0) - tilt (~> 1.2) + sprockets (>= 2.0.0) + tilt (>= 1.2) hashdiff (0.2.3) hashie (3.4.3) hike (1.2.3) @@ -811,7 +811,7 @@ DEPENDENCIES guard-rspec (= 4.6.4) guard-rubocop (= 1.2.0) haml (= 4.0.7) - handlebars_assets (= 0.22.0) + handlebars_assets (= 0.23.0) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) jasmine (= 2.4.0) From 809763f653442d208f922523df6124f8d0bcd1be Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 20:31:36 +0100 Subject: [PATCH 04/10] Bump jquery-rails and rails-assets-jquery --- Gemfile | 4 ++-- Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index c470c00d6..d5275d8a7 100644 --- a/Gemfile +++ b/Gemfile @@ -85,13 +85,13 @@ gem "entypo-rails", "2.2.3" gem "backbone-on-rails", "1.2.0.0" gem "handlebars_assets", "0.23.0" -gem "jquery-rails", "4.0.5" +gem "jquery-rails", "4.1.0" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.0.2" gem "js-routes", "1.2.0" source "https://rails-assets.org" do - gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails + gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails gem "rails-assets-markdown-it", "5.1.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 3ef826898..e9de2deb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -398,7 +398,7 @@ GEM rake jasmine-core (2.4.1) jasmine-jquery-rails (2.0.3) - jquery-rails (4.0.5) + jquery-rails (4.1.0) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -553,7 +553,7 @@ GEM rails-assets-jasmine (~> 2) rails-assets-jeresig--jquery.hotkeys (0.2.0) rails-assets-jquery (>= 1.4.2) - rails-assets-jquery (1.11.2) + rails-assets-jquery (1.12.0) rails-assets-jquery-colorbox (1.6.3) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen-plugin (0.5.0) @@ -816,7 +816,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 2.4.0) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.0.5) + jquery-rails (= 4.1.0) jquery-ui-rails (= 5.0.5) js-routes (= 1.2.0) js_image_paths (= 0.0.2) @@ -853,7 +853,7 @@ DEPENDENCIES rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! - rails-assets-jquery (= 1.11.2)! + rails-assets-jquery (= 1.12.0)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! rails-assets-markdown-it (= 5.1.0)! From 0540a140564c11d2df8b2fefdb5ad179a6045e06 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 20:34:35 +0100 Subject: [PATCH 05/10] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d5275d8a7..680de7016 100644 --- a/Gemfile +++ b/Gemfile @@ -88,7 +88,7 @@ gem "handlebars_assets", "0.23.0" gem "jquery-rails", "4.1.0" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.0.2" -gem "js-routes", "1.2.0" +gem "js-routes", "1.2.3" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails diff --git a/Gemfile.lock b/Gemfile.lock index e9de2deb6..34153c1a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -404,7 +404,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.2.0) + js-routes (1.2.3) railties (>= 3.2) sprockets-rails js_image_paths (0.0.2) @@ -818,7 +818,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.1.0) jquery-ui-rails (= 5.0.5) - js-routes (= 1.2.0) + js-routes (= 1.2.3) js_image_paths (= 0.0.2) jshintrb (= 0.3.0) json (= 1.8.3) From 80088fa2a0c564dc82ec5d2dd5489e2b2747328e Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 20:43:46 +0100 Subject: [PATCH 06/10] Bump simple_captcha2 --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 680de7016..e1a27f3ed 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem "devise-token_authenticatable", "~> 0.4.0" # Captcha -gem "simple_captcha2", "0.3.4", require: "simple_captcha" +gem "simple_captcha2", "0.4.0", require: "simple_captcha" # Background processing diff --git a/Gemfile.lock b/Gemfile.lock index 34153c1a7..a90ec7472 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -453,7 +453,6 @@ GEM multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.20) naught (1.1.0) nenv (0.2.0) nested_form (0.3.2) @@ -495,6 +494,7 @@ GEM orm_adapter (0.5.0) parser (2.2.3.0) ast (>= 1.1, < 3.0) + pg (0.18.4) phantomjs (1.9.8.0) powerpack (0.1.1) pry (0.10.3) @@ -686,7 +686,7 @@ GEM ice_cube (= 0.11.1) sidekiq (>= 3.0.0) sigar (0.7.3) - simple_captcha2 (0.3.4) + simple_captcha2 (0.4.0) rails (>= 4.1) simple_oauth (0.3.1) simplecov (0.11.1) @@ -829,7 +829,6 @@ DEPENDENCIES mini_magick (= 4.3.6) minitest mobile-fu (= 1.3.1) - mysql2 (= 0.3.20) nokogiri (= 1.6.7.2) omniauth (= 1.3.1) omniauth-facebook (= 3.0.0) @@ -837,6 +836,7 @@ DEPENDENCIES omniauth-twitter (= 1.2.1) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.1) + pg (= 0.18.4) pry pry-byebug pry-debundle @@ -883,7 +883,7 @@ DEPENDENCIES shoulda-matchers (= 3.0.1) sidekiq (= 3.4.2) sidetiq (= 0.6.3) - simple_captcha2 (= 0.3.4) + simple_captcha2 (= 0.4.0) simplecov (= 0.11.1) sinatra (= 1.4.6) sinon-rails (= 1.15.0) From 3065e1bf212645b63cb8695f9888be77b4a883a4 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 20:45:40 +0100 Subject: [PATCH 07/10] Bump sinatra --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index e1a27f3ed..4acc1a70d 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem "simple_captcha2", "0.4.0", require: "simple_captcha" # Background processing gem "sidekiq", "3.4.2" -gem "sinatra", "1.4.6" +gem "sinatra", "1.4.7" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index a90ec7472..13089c56c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -694,8 +694,8 @@ GEM json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.6) - rack (~> 1.4) + sinatra (1.4.7) + rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) sinon-rails (1.15.0) @@ -885,7 +885,7 @@ DEPENDENCIES sidetiq (= 0.6.3) simple_captcha2 (= 0.4.0) simplecov (= 0.11.1) - sinatra (= 1.4.6) + sinatra (= 1.4.7) sinon-rails (= 1.15.0) spring (= 1.6.1) spring-commands-cucumber (= 1.0.1) From 89dedb8ba1f5bbd14b85787803d9db5ef7a4f073 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 20:48:37 +0100 Subject: [PATCH 08/10] Bump will_paginate --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4acc1a70d..3403e9fef 100644 --- a/Gemfile +++ b/Gemfile @@ -167,7 +167,7 @@ gem "typhoeus", "0.8.0" gem "gon", "6.0.1" gem "haml", "4.0.7" gem "mobile-fu", "1.3.1" -gem "will_paginate", "3.0.7" +gem "will_paginate", "3.1.0" gem "rails-timeago", "2.11.0" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index 13089c56c..2c1022c16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -764,7 +764,7 @@ GEM crack (>= 0.3.2) hashdiff websocket (1.2.2) - will_paginate (3.0.7) + will_paginate (3.1.0) xml-simple (1.1.5) xpath (2.0.0) nokogiri (~> 1.3) @@ -899,7 +899,7 @@ DEPENDENCIES unicorn (= 5.0.1) uuid (= 2.3.8) webmock (= 1.22.3) - will_paginate (= 3.0.7) + will_paginate (= 3.1.0) BUNDLED WITH 1.11.2 From f1aad6512aebefdaebdad9f4871fd0c516327362 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 21:28:25 +0100 Subject: [PATCH 09/10] Bump rails-assets-highlightjs --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3403e9fef..0e065a047 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,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.0.0" + gem "rails-assets-highlightjs", "9.1.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 2c1022c16..c84cf2534 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -545,7 +545,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.0.0) + rails-assets-highlightjs (9.1.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) rails-assets-jasmine (2.4.1) @@ -849,7 +849,7 @@ DEPENDENCIES rack-ssl (= 1.4.1) rails (= 4.2.5.1) rails-assets-diaspora_jsxc (~> 0.1.4)! - rails-assets-highlightjs (= 9.0.0)! + rails-assets-highlightjs (= 9.1.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! From 2f66c7c89a114f0ed533c7a472881466ca4fe3a5 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 31 Jan 2016 21:30:10 +0100 Subject: [PATCH 10/10] Bump rails-assets-perfect-scrollbar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0e065a047..f38e511d6 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ source "https://rails-assets.org" do gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" gem "rails-assets-jquery-placeholder", "2.3.1" gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.8" + gem "rails-assets-perfect-scrollbar", "0.6.10" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" end diff --git a/Gemfile.lock b/Gemfile.lock index c84cf2534..8cf58cf4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -571,7 +571,7 @@ GEM rails-assets-markdown-it-sanitizer (0.4.1) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-perfect-scrollbar (0.6.8) + rails-assets-perfect-scrollbar (0.6.10) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -863,7 +863,7 @@ DEPENDENCIES rails-assets-markdown-it-sanitizer (= 0.4.1)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-perfect-scrollbar (= 0.6.8)! + rails-assets-perfect-scrollbar (= 0.6.10)! rails-i18n (= 4.0.8) rails-timeago (= 2.11.0) rails_admin (= 0.8.1)