Updated rails to 4.2.2 and updated gems
diff --git a/Gemfile b/Gemfile
index b2e8022..59f1425 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
ruby '2.2.1'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.1'
+gem 'rails', '4.2.2'
gem 'puma'
diff --git a/Gemfile.lock b/Gemfile.lock
index 168029c..116d4e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,36 +1,36 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.1)
- actionpack (= 4.2.1)
- actionview (= 4.2.1)
- activejob (= 4.2.1)
+ actionmailer (4.2.2)
+ actionpack (= 4.2.2)
+ actionview (= 4.2.2)
+ activejob (= 4.2.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.1)
- actionview (= 4.2.1)
- activesupport (= 4.2.1)
+ actionpack (4.2.2)
+ actionview (= 4.2.2)
+ activesupport (= 4.2.2)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
- actionview (4.2.1)
- activesupport (= 4.2.1)
+ actionview (4.2.2)
+ activesupport (= 4.2.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
- activejob (4.2.1)
- activesupport (= 4.2.1)
+ activejob (4.2.2)
+ activesupport (= 4.2.2)
globalid (>= 0.3.0)
- activemodel (4.2.1)
- activesupport (= 4.2.1)
+ activemodel (4.2.2)
+ activesupport (= 4.2.2)
builder (~> 3.1)
- activerecord (4.2.1)
- activemodel (= 4.2.1)
- activesupport (= 4.2.1)
+ activerecord (4.2.2)
+ activemodel (= 4.2.2)
+ activesupport (= 4.2.2)
arel (~> 6.0)
- activesupport (4.2.1)
+ activesupport (4.2.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -100,10 +100,10 @@
hashie (3.4.2)
headless (2.1.0)
i18n (0.7.0)
- jbuilder (2.2.16)
+ jbuilder (2.3.0)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
- jquery-rails (4.0.3)
+ jquery-rails (4.0.4)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -118,7 +118,7 @@
mime-types (2.6.1)
mini_portile (0.6.2)
minitest (5.7.0)
- multi_json (1.11.0)
+ multi_json (1.11.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.6.2)
@@ -146,19 +146,19 @@
rack (>= 1.1, < 2.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
- rack (1.6.1)
+ rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.1)
- actionmailer (= 4.2.1)
- actionpack (= 4.2.1)
- actionview (= 4.2.1)
- activejob (= 4.2.1)
- activemodel (= 4.2.1)
- activerecord (= 4.2.1)
- activesupport (= 4.2.1)
+ rails (4.2.2)
+ actionmailer (= 4.2.2)
+ actionpack (= 4.2.2)
+ actionview (= 4.2.2)
+ activejob (= 4.2.2)
+ activemodel (= 4.2.2)
+ activerecord (= 4.2.2)
+ activesupport (= 4.2.2)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.1)
+ railties (= 4.2.2)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -173,32 +173,32 @@
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
- railties (4.2.1)
- actionpack (= 4.2.1)
- activesupport (= 4.2.1)
+ railties (4.2.2)
+ actionpack (= 4.2.2)
+ activesupport (= 4.2.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rdoc (4.2.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
- rspec-core (3.2.3)
- rspec-support (~> 3.2.0)
- rspec-expectations (3.2.1)
+ rspec-core (3.3.1)
+ rspec-support (~> 3.3.0)
+ rspec-expectations (3.3.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.2.0)
- rspec-mocks (3.2.1)
+ rspec-support (~> 3.3.0)
+ rspec-mocks (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.2.0)
- rspec-rails (3.2.3)
+ rspec-support (~> 3.3.0)
+ rspec-rails (3.3.2)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
- rspec-core (~> 3.2.0)
- rspec-expectations (~> 3.2.0)
- rspec-mocks (~> 3.2.0)
- rspec-support (~> 3.2.0)
- rspec-support (3.2.2)
+ rspec-core (~> 3.3.0)
+ rspec-expectations (~> 3.3.0)
+ rspec-mocks (~> 3.3.0)
+ rspec-support (~> 3.3.0)
+ rspec-support (3.3.0)
sass (3.4.14)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
@@ -268,7 +268,7 @@
pg
puma
quiet_assets
- rails (= 4.2.1)
+ rails (= 4.2.2)
rails_12factor
rspec-rails
sass-rails (~> 5.0)
