From 9af3e957f696ee77309788d3f97db9c909b9ee84 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Fri, 4 Mar 2016 12:56:54 +0100 Subject: [PATCH 1/5] Bump rails --- Gemfile | 2 +- Gemfile.lock | 63 ++++++++++++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Gemfile b/Gemfile index 0700fdcf5..57f597292 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "4.2.5.1" +gem "rails", "4.2.5.2" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index 1702c33a7..769331968 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,40 +3,40 @@ GEM remote: https://rails-assets.org/ specs: CFPropertyList (2.3.2) - actionmailer (4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) + actionmailer (4.2.5.2) + actionpack (= 4.2.5.2) + actionview (= 4.2.5.2) + activejob (= 4.2.5.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.1) - actionview (= 4.2.5.1) - activesupport (= 4.2.5.1) + actionpack (4.2.5.2) + actionview (= 4.2.5.2) + activesupport (= 4.2.5.2) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.1) - activesupport (= 4.2.5.1) + actionview (4.2.5.2) + activesupport (= 4.2.5.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) active_model_serializers (0.9.4) activemodel (>= 3.2) - activejob (4.2.5.1) - activesupport (= 4.2.5.1) + activejob (4.2.5.2) + activesupport (= 4.2.5.2) globalid (>= 0.3.0) - activemodel (4.2.5.1) - activesupport (= 4.2.5.1) + activemodel (4.2.5.2) + activesupport (= 4.2.5.2) builder (~> 3.1) - activerecord (4.2.5.1) - activemodel (= 4.2.5.1) - activesupport (= 4.2.5.1) + activerecord (4.2.5.2) + activemodel (= 4.2.5.2) + activesupport (= 4.2.5.2) arel (~> 6.0) activerecord-import (0.11.0) activerecord (>= 3.0) - activesupport (4.2.5.1) + activesupport (4.2.5.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -115,6 +115,7 @@ GEM compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 2.13) + concurrent-ruby (1.0.1) configurate (0.3.1) connection_pool (2.2.0) crack (0.4.3) @@ -447,7 +448,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) messagebus_ruby_api (1.0.3) method_source (0.8.2) - mime-types (2.99) + mime-types (2.99.1) mini_magick (4.4.0) mini_portile2 (2.0.0) minitest (5.8.4) @@ -531,16 +532,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.1) - actionmailer (= 4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) - activemodel (= 4.2.5.1) - activerecord (= 4.2.5.1) - activesupport (= 4.2.5.1) + rails (4.2.5.2) + actionmailer (= 4.2.5.2) + actionpack (= 4.2.5.2) + actionview (= 4.2.5.2) + activejob (= 4.2.5.2) + activemodel (= 4.2.5.2) + activerecord (= 4.2.5.2) + activesupport (= 4.2.5.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.1) + railties (= 4.2.5.2) sprockets-rails rails-assets-diaspora_jsxc (0.1.4) rails-assets-favico.js (~> 0.3.9) @@ -605,9 +606,9 @@ GEM remotipart (~> 1.0) safe_yaml (~> 1.0) sass-rails (>= 4.0, < 6) - railties (4.2.5.1) - actionpack (= 4.2.5.1) - activesupport (= 4.2.5.1) + railties (4.2.5.2) + actionpack (= 4.2.5.2) + activesupport (= 4.2.5.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) @@ -853,7 +854,7 @@ DEPENDENCIES rack-protection (= 1.5.3) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 4.2.5.1) + rails (= 4.2.5.2) rails-assets-diaspora_jsxc (~> 0.1.4)! rails-assets-highlightjs (= 9.1.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! From 5eba267db22f5096f9f477e5349bc597393af821 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Fri, 4 Mar 2016 13:03:11 +0100 Subject: [PATCH 2/5] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 57f597292..b37a47d8d 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.3.1" +gem "autoprefixer-rails", "6.3.3.1" # Database diff --git a/Gemfile.lock b/Gemfile.lock index 769331968..f23e60d8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,9 +57,8 @@ GEM ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (6.3.1) + autoprefixer-rails (6.3.3.1) execjs - json backbone-on-rails (1.2.0.0) eco ejs @@ -115,7 +114,6 @@ GEM compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 2.13) - concurrent-ruby (1.0.1) configurate (0.3.1) connection_pool (2.2.0) crack (0.4.3) @@ -786,7 +784,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 6.3.1) + autoprefixer-rails (= 6.3.3.1) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) capybara (= 2.6.2) From 558094409bcd2a7946940fccd297c5f23d61e269 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Fri, 4 Mar 2016 13:05:07 +0100 Subject: [PATCH 3/5] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b37a47d8d..0870a7fe4 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.3" +gem "js-routes", "1.2.4" 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 f23e60d8b..8f0049001 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -408,7 +408,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.2.3) + js-routes (1.2.4) railties (>= 3.2) sprockets-rails js_image_paths (0.0.2) @@ -823,7 +823,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.1.0) jquery-ui-rails (= 5.0.5) - js-routes (= 1.2.3) + js-routes (= 1.2.4) js_image_paths (= 0.0.2) jshintrb (= 0.3.0) json (= 1.8.3) From e00cbf62aecfec96d8761bb441a47941cc165958 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Fri, 4 Mar 2016 13:06:51 +0100 Subject: [PATCH 4/5] Bump js_image_paths --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0870a7fe4..ab8aed9a3 100644 --- a/Gemfile +++ b/Gemfile @@ -87,7 +87,7 @@ gem "backbone-on-rails", "1.2.0.0" 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_image_paths", "0.1.0" gem "js-routes", "1.2.4" source "https://rails-assets.org" do diff --git a/Gemfile.lock b/Gemfile.lock index 8f0049001..a4e602b14 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,7 +411,7 @@ GEM js-routes (1.2.4) railties (>= 3.2) sprockets-rails - js_image_paths (0.0.2) + js_image_paths (0.1.0) rails (~> 4.0) jshintrb (0.3.0) execjs @@ -824,7 +824,7 @@ DEPENDENCIES jquery-rails (= 4.1.0) jquery-ui-rails (= 5.0.5) js-routes (= 1.2.4) - js_image_paths (= 0.0.2) + js_image_paths (= 0.1.0) jshintrb (= 0.3.0) json (= 1.8.3) json-schema (= 2.6.0) From 92fcbfbedea3a57979a99b93842848058f55c362 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Fri, 4 Mar 2016 13:08:10 +0100 Subject: [PATCH 5/5] Bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ab8aed9a3..a5716e277 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem "autoprefixer-rails", "6.3.3.1" ENV["DB"] ||= "mysql" -gem "mysql2", "0.4.2" if ENV["DB"] == "all" || ENV["DB"] == "mysql" +gem "mysql2", "0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem "activerecord-import", "0.11.0" diff --git a/Gemfile.lock b/Gemfile.lock index a4e602b14..6f422d1ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -457,6 +457,7 @@ GEM multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) + mysql2 (0.4.3) naught (1.1.0) nenv (0.3.0) nested_form (0.3.2) @@ -498,7 +499,6 @@ GEM orm_adapter (0.5.0) parser (2.3.0.4) ast (~> 2.2) - pg (0.18.4) phantomjs (2.1.1.0) powerpack (0.1.1) pry (0.10.3) @@ -834,6 +834,7 @@ DEPENDENCIES mini_magick (= 4.4.0) minitest mobile-fu (= 1.3.1) + mysql2 (= 0.4.3) nokogiri (= 1.6.7.2) omniauth (= 1.3.1) omniauth-facebook (= 3.0.0) @@ -841,7 +842,6 @@ 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