From 8816c7bc8416c422022628797698f1153923e3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 25 Aug 2015 01:14:48 +0200
Subject: [PATCH] Bump Rails to 4.2.4
---
Gemfile | 2 +-
Gemfile.lock | 66 ++++++++++++++++++++++++++--------------------------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/Gemfile b/Gemfile
index 18348e6937..4cd6e22ee6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem "rails", "4.2.3"
+gem "rails", "4.2.4"
# Legacy Rails features, remove me!
# responders (class level)
diff --git a/Gemfile.lock b/Gemfile.lock
index 2332bd4f71..57622e0464 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,40 +3,40 @@ GEM
remote: https://rails-assets.org/
specs:
CFPropertyList (2.3.1)
- actionmailer (4.2.3)
- actionpack (= 4.2.3)
- actionview (= 4.2.3)
- activejob (= 4.2.3)
+ actionmailer (4.2.4)
+ actionpack (= 4.2.4)
+ actionview (= 4.2.4)
+ activejob (= 4.2.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.3)
- actionview (= 4.2.3)
- activesupport (= 4.2.3)
+ actionpack (4.2.4)
+ actionview (= 4.2.4)
+ activesupport (= 4.2.4)
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.3)
- activesupport (= 4.2.3)
+ actionview (4.2.4)
+ activesupport (= 4.2.4)
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.3)
activemodel (>= 3.2)
- activejob (4.2.3)
- activesupport (= 4.2.3)
+ activejob (4.2.4)
+ activesupport (= 4.2.4)
globalid (>= 0.3.0)
- activemodel (4.2.3)
- activesupport (= 4.2.3)
+ activemodel (4.2.4)
+ activesupport (= 4.2.4)
builder (~> 3.1)
- activerecord (4.2.3)
- activemodel (= 4.2.3)
- activesupport (= 4.2.3)
+ activerecord (4.2.4)
+ activemodel (= 4.2.4)
+ activesupport (= 4.2.4)
arel (~> 6.0)
activerecord-import (0.10.0)
activerecord (>= 3.0)
- activesupport (4.2.3)
+ activesupport (4.2.4)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -312,7 +312,7 @@ GEM
ruby-progressbar (~> 1.4)
gherkin (2.12.2)
multi_json (~> 1.3)
- globalid (0.3.5)
+ globalid (0.3.6)
activesupport (>= 4.1.0)
gon (6.0.1)
actionpack (>= 3.0)
@@ -409,7 +409,7 @@ GEM
multi_json (~> 1.10)
logging-rails (0.5.0)
logging (>= 1.8)
- loofah (2.0.2)
+ loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
macaddr (1.7.1)
@@ -508,16 +508,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.3)
- actionmailer (= 4.2.3)
- actionpack (= 4.2.3)
- actionview (= 4.2.3)
- activejob (= 4.2.3)
- activemodel (= 4.2.3)
- activerecord (= 4.2.3)
- activesupport (= 4.2.3)
+ rails (4.2.4)
+ actionmailer (= 4.2.4)
+ actionpack (= 4.2.4)
+ actionview (= 4.2.4)
+ activejob (= 4.2.4)
+ activemodel (= 4.2.4)
+ activerecord (= 4.2.4)
+ activesupport (= 4.2.4)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.3)
+ railties (= 4.2.4)
sprockets-rails
rails-assets-colorbox (1.6.3)
rails-assets-jquery (>= 1.3.2)
@@ -560,7 +560,7 @@ GEM
rails-assets-perfect-scrollbar (0.6.4)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.6)
+ rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
@@ -586,9 +586,9 @@ GEM
remotipart (~> 1.0)
safe_yaml (~> 1.0)
sass-rails (>= 4.0, < 6)
- railties (4.2.3)
- actionpack (= 4.2.3)
- activesupport (= 4.2.3)
+ railties (4.2.4)
+ actionpack (= 4.2.4)
+ activesupport (= 4.2.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
@@ -823,7 +823,7 @@ DEPENDENCIES
rack-protection (= 1.5.3)
rack-rewrite (= 1.5.1)
rack-ssl (= 1.4.1)
- rails (= 4.2.3)
+ rails (= 4.2.4)
rails-assets-diaspora_jsxc (~> 0.1.4.alpha, < 0.1.4.develop)!
rails-assets-highlightjs (= 8.6.0)!
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
--
GitLab