diff --git a/.ruby-version b/.ruby-version index b1b25a5..5859406 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.2 +2.2.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ccc171..49ffd20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Unreleased +* Update Rails to 4.2.4 and Ruby to 2.2.3 + ([#193](https://github.com/fs/rails-base-api/pull/193)) * Sync Rubocop rules with Rails-Base * Replace custom token authentication strategy with [simple_token_authentication](https://github.com/gonzalo-bulnes/simple_token_authentication) ([#184](https://github.com/fs/rails-base-api/pull/184)) diff --git a/Gemfile b/Gemfile index 7f36e8e..aa6560e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source "https://rubygems.org" -ruby "2.2.2" +ruby "2.2.3" # the most important stuff -gem "rails", "4.2.3" +gem "rails", "4.2.4" gem "pg" gem "rails-api" gem "rails_api_format", path: "lib/rails_api_format" diff --git a/Gemfile.lock b/Gemfile.lock index 9ea617c..eda4037 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,36 +17,36 @@ PATH 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) @@ -141,15 +141,15 @@ GEM addressable (~> 2.3) letter_opener (1.2.0) launchy (~> 2.2) - loofah (2.0.2) + loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) mail_safe (0.3.1) actionmailer (>= 1.3.6) - mime-types (2.6.1) + mime-types (2.6.2) mini_portile (0.6.2) - minitest (5.8.0) + minitest (5.8.1) multi_json (1.11.2) mustache (0.99.8) nokogiri (1.6.6.2) @@ -163,23 +163,23 @@ GEM rack-cors (0.2.9) 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-api (0.4.0) actionpack (>= 3.2.11) railties (>= 3.2.11) 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) @@ -199,9 +199,9 @@ GEM ruby-progressbar rails_serve_static_assets (0.0.1) rails_stdout_logging (0.0.3) - 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) @@ -270,9 +270,9 @@ GEM spring (1.3.6) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.2.0) - rack (~> 1.0) - sprockets-rails (2.3.2) + sprockets (3.4.0) + rack (> 1, < 3) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -319,7 +319,7 @@ DEPENDENCIES mail_safe pg rack-cors - rails (= 4.2.3) + rails (= 4.2.4) rails-api rails_12factor rails_api_format! @@ -337,3 +337,6 @@ DEPENDENCIES spring-commands-rspec thin webmock + +BUNDLED WITH + 1.10.6 diff --git a/README.md b/README.md index a426e9d..989ae53 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This simple application includes ruby/rails technology which we use at FlatStack for new REST API projects. -Application currently based on Rails 4 stable branch and Ruby 2.1 +Application currently based on Rails 4 stable branch and Ruby 2.2 ## API