Permalink
Browse files

Merge branch 'topic-update-rails'

  • Loading branch information...
2 parents e193254 + 6aa3db2 commit 3589da2869058f3758369ed50df4edae64ac47f1 @zflat zflat committed Oct 3, 2015
Showing with 36 additions and 36 deletions.
  1. +1 −1 Gemfile
  2. +35 −35 Gemfile.lock
View
@@ -2,7 +2,7 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.3'
+gem 'rails', '4.2.4'
gem 'therubyracer', '~>0.12.1'
View
@@ -66,36 +66,36 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- 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)
- 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)
- activesupport (4.2.3)
+ activesupport (4.2.4)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -109,7 +109,7 @@ GEM
builder
multi_json
ansi (1.4.3)
- arel (6.0.2)
+ arel (6.0.3)
autoprefixer-rails (3.1.0.20140911)
execjs
awesome_nested_set (3.0.1)
@@ -180,7 +180,7 @@ GEM
formatador (0.2.5)
friendly_id (5.0.4)
activerecord (>= 4.0.0)
- globalid (0.3.5)
+ globalid (0.3.6)
activesupport (>= 4.1.0)
guard (2.12.1)
formatador (>= 0.2.4)
@@ -226,7 +226,7 @@ GEM
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
- loofah (2.0.2)
+ loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
mail (2.6.3)
@@ -236,7 +236,7 @@ GEM
mini_magick (3.8.1)
subexec (~> 0.2.1)
mini_portile (0.6.2)
- minitest (5.7.0)
+ minitest (5.8.0)
multi_json (1.11.2)
multi_xml (0.5.5)
mysql2 (0.3.16)
@@ -273,20 +273,20 @@ GEM
rack-utf8_sanitizer (1.3.0)
rack (~> 1.0)
railroady (1.1.2)
- 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-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)
@@ -297,9 +297,9 @@ GEM
ruby-graphviz (~> 1.0.4)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
- 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)
rake (10.4.2)
@@ -431,7 +431,7 @@ DEPENDENCIES
rack-protection (~> 1.5.3)
rack-utf8_sanitizer
railroady (~> 1)
- rails (= 4.2.3)
+ rails (= 4.2.4)
rails-erd (~> 1.1.0)
rb-inotify (~> 0.9)
rqrcode-rails3 (~> 0.1.7)

0 comments on commit 3589da2

Please sign in to comment.