Created
August 22, 2014 06:42
-
-
Save eiel/403e6e473487bb9a9a42 to your computer and use it in GitHub Desktop.
rails new した時の違い 4.1.5 と 4.2.0
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ur 4.1.5/Gemfile 4.2.0.beta1/Gemfile | |
--- 4.1.5/Gemfile 2014-08-22 15:14:46.000000000 +0900 | |
+++ 4.2.0.beta1/Gemfile 2014-08-22 15:15:19.000000000 +0900 | |
@@ -2,17 +2,17 @@ | |
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | |
-gem 'rails', '4.1.5' | |
+gem 'rails', '4.2.0.beta1' | |
# Use sqlite3 as the database for Active Record | |
gem 'sqlite3' | |
# Use SCSS for stylesheets | |
-gem 'sass-rails', '~> 4.0.3' | |
+gem 'sass-rails', '~> 5.0.0.beta1' | |
# Use Uglifier as compressor for JavaScript assets | |
gem 'uglifier', '>= 1.3.0' | |
# Use CoffeeScript for .js.coffee assets and views | |
gem 'coffee-rails', '~> 4.0.0' | |
# See https://github.com/sstephenson/execjs#readme for more supported runtimes | |
-# gem 'therubyracer', platforms: :ruby | |
+# gem 'therubyracer', platforms: :ruby | |
# Use jquery as the JavaScript library | |
gem 'jquery-rails' | |
@@ -21,20 +21,28 @@ | |
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder | |
gem 'jbuilder', '~> 2.0' | |
# bundle exec rake doc:rails generates the API under doc/api. | |
-gem 'sdoc', '~> 0.4.0', group: :doc | |
- | |
-# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring | |
-gem 'spring', group: :development | |
+gem 'sdoc', '~> 0.4.0', group: :doc | |
# Use ActiveModel has_secure_password | |
# gem 'bcrypt', '~> 3.1.7' | |
-# Use unicorn as the app server | |
+# Use Rails Html Sanitizer for HTML sanitization | |
+gem 'rails-html-sanitizer', '~> 1.0' | |
+ | |
+# Use Unicorn as the app server | |
# gem 'unicorn' | |
# Use Capistrano for deployment | |
# gem 'capistrano-rails', group: :development | |
-# Use debugger | |
-# gem 'debugger', group: [:development, :test] | |
+group :development, :test do | |
+ # Call 'debugger' anywhere in the code to stop execution and get a debugger console | |
+ gem 'byebug' | |
+ | |
+ # Access an IRB console on exceptions page and /console in development | |
+ gem 'web-console', '~> 2.0.0.beta2' | |
+ | |
+ # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring | |
+ gem 'spring' | |
+end | |
diff -ur 4.1.5/Gemfile.lock 4.2.0.beta1/Gemfile.lock | |
--- 4.1.5/Gemfile.lock 2014-08-22 15:14:56.000000000 +0900 | |
+++ 4.2.0.beta1/Gemfile.lock 2014-08-22 15:15:43.000000000 +0900 | |
@@ -1,34 +1,46 @@ | |
GEM | |
remote: https://rubygems.org/ | |
specs: | |
- actionmailer (4.1.5) | |
- actionpack (= 4.1.5) | |
- actionview (= 4.1.5) | |
- mail (~> 2.5.4) | |
- actionpack (4.1.5) | |
- actionview (= 4.1.5) | |
- activesupport (= 4.1.5) | |
- rack (~> 1.5.2) | |
+ actionmailer (4.2.0.beta1) | |
+ actionpack (= 4.2.0.beta1) | |
+ actionview (= 4.2.0.beta1) | |
+ mail (~> 2.5, >= 2.5.4) | |
+ rails-dom-testing (~> 1.0, >= 1.0.2) | |
+ actionpack (4.2.0.beta1) | |
+ actionview (= 4.2.0.beta1) | |
+ activesupport (= 4.2.0.beta1) | |
+ rack (~> 1.6.0.beta) | |
rack-test (~> 0.6.2) | |
- actionview (4.1.5) | |
- activesupport (= 4.1.5) | |
+ rails-deprecated_sanitizer (~> 1.0, >= 1.0.2) | |
+ rails-dom-testing (~> 1.0, >= 1.0.2) | |
+ actionview (4.2.0.beta1) | |
+ activesupport (= 4.2.0.beta1) | |
builder (~> 3.1) | |
erubis (~> 2.7.0) | |
- activemodel (4.1.5) | |
- activesupport (= 4.1.5) | |
+ rails-deprecated_sanitizer (~> 1.0, >= 1.0.2) | |
+ rails-dom-testing (~> 1.0, >= 1.0.2) | |
+ activejob (4.2.0.beta1) | |
+ globalid (>= 0.2.3) | |
+ activemodel (4.2.0.beta1) | |
+ activesupport (= 4.2.0.beta1) | |
builder (~> 3.1) | |
- activerecord (4.1.5) | |
- activemodel (= 4.1.5) | |
- activesupport (= 4.1.5) | |
- arel (~> 5.0.0) | |
- activesupport (4.1.5) | |
- i18n (~> 0.6, >= 0.6.9) | |
+ activerecord (4.2.0.beta1) | |
+ activemodel (= 4.2.0.beta1) | |
+ activesupport (= 4.2.0.beta1) | |
+ arel (>= 6.0.0.beta1, < 6.1) | |
+ activesupport (4.2.0.beta1) | |
+ i18n (>= 0.7.0.beta1, < 0.8) | |
json (~> 1.7, >= 1.7.7) | |
minitest (~> 5.1) | |
thread_safe (~> 0.1) | |
tzinfo (~> 1.1) | |
- arel (5.0.1.20140414130214) | |
+ arel (6.0.0.beta1) | |
+ binding_of_caller (0.7.3.pre1) | |
+ debug_inspector (>= 0.0.1) | |
builder (3.2.2) | |
+ byebug (3.2.0) | |
+ columnize (~> 0.8) | |
+ debugger-linecache (~> 1.2) | |
coffee-rails (4.0.1) | |
coffee-script (>= 2.2.0) | |
railties (>= 4.0.0, < 5.0) | |
@@ -36,10 +48,15 @@ | |
coffee-script-source | |
execjs | |
coffee-script-source (1.7.1) | |
+ columnize (0.8.9) | |
+ debug_inspector (0.0.2) | |
+ debugger-linecache (1.2.0) | |
erubis (2.7.0) | |
execjs (2.2.1) | |
+ globalid (0.2.3) | |
+ activesupport (>= 4.1.0) | |
hike (1.2.3) | |
- i18n (0.6.11) | |
+ i18n (0.7.0.beta1) | |
jbuilder (2.1.3) | |
activesupport (>= 3.0.0, < 5) | |
multi_json (~> 1.2) | |
@@ -47,60 +64,69 @@ | |
railties (>= 3.0, < 5.0) | |
thor (>= 0.14, < 2.0) | |
json (1.8.1) | |
- mail (2.5.4) | |
- mime-types (~> 1.16) | |
- treetop (~> 1.4.8) | |
- mime-types (1.25.1) | |
+ loofah (2.0.1) | |
+ nokogiri (>= 1.5.9) | |
+ mail (2.6.1) | |
+ mime-types (>= 1.16, < 3) | |
+ mime-types (2.3) | |
+ mini_portile (0.6.0) | |
minitest (5.4.0) | |
multi_json (1.10.1) | |
- polyglot (0.3.5) | |
- rack (1.5.2) | |
+ nokogiri (1.6.3.1) | |
+ mini_portile (= 0.6.0) | |
+ rack (1.6.0.beta) | |
rack-test (0.6.2) | |
rack (>= 1.0) | |
- rails (4.1.5) | |
- actionmailer (= 4.1.5) | |
- actionpack (= 4.1.5) | |
- actionview (= 4.1.5) | |
- activemodel (= 4.1.5) | |
- activerecord (= 4.1.5) | |
- activesupport (= 4.1.5) | |
+ rails (4.2.0.beta1) | |
+ actionmailer (= 4.2.0.beta1) | |
+ actionpack (= 4.2.0.beta1) | |
+ actionview (= 4.2.0.beta1) | |
+ activejob (= 4.2.0.beta1) | |
+ activemodel (= 4.2.0.beta1) | |
+ activerecord (= 4.2.0.beta1) | |
+ activesupport (= 4.2.0.beta1) | |
bundler (>= 1.3.0, < 2.0) | |
- railties (= 4.1.5) | |
- sprockets-rails (~> 2.0) | |
- railties (4.1.5) | |
- actionpack (= 4.1.5) | |
- activesupport (= 4.1.5) | |
+ railties (= 4.2.0.beta1) | |
+ sprockets-rails (~> 3.0.0.beta1) | |
+ rails-deprecated_sanitizer (1.0.2) | |
+ activesupport (>= 4.2.0.alpha) | |
+ rails-dom-testing (1.0.2) | |
+ activesupport | |
+ nokogiri (~> 1.6.0) | |
+ rails-deprecated_sanitizer (>= 1.0.1) | |
+ rails-html-sanitizer (1.0.0) | |
+ loofah (~> 2.0) | |
+ railties (4.2.0.beta1) | |
+ actionpack (= 4.2.0.beta1) | |
+ activesupport (= 4.2.0.beta1) | |
rake (>= 0.8.7) | |
thor (>= 0.18.1, < 2.0) | |
rake (10.3.2) | |
rdoc (4.1.1) | |
json (~> 1.4) | |
- sass (3.2.19) | |
- sass-rails (4.0.3) | |
+ sass (3.4.0) | |
+ sass-rails (5.0.0.beta1) | |
railties (>= 4.0.0, < 5.0) | |
- sass (~> 3.2.0) | |
- sprockets (~> 2.8, <= 2.11.0) | |
- sprockets-rails (~> 2.0) | |
+ sass (~> 3.2) | |
+ sprockets (~> 2.12) | |
+ sprockets-rails (>= 2.0, < 4.0) | |
sdoc (0.4.1) | |
json (~> 1.7, >= 1.7.7) | |
rdoc (~> 4.0) | |
spring (1.1.3) | |
- sprockets (2.11.0) | |
+ sprockets (2.12.1) | |
hike (~> 1.2) | |
multi_json (~> 1.0) | |
rack (~> 1.0) | |
tilt (~> 1.1, != 1.3.0) | |
- sprockets-rails (2.1.3) | |
- actionpack (>= 3.0) | |
- activesupport (>= 3.0) | |
+ sprockets-rails (3.0.0.beta1) | |
+ actionpack (>= 4.0) | |
+ activesupport (>= 4.0) | |
sprockets (~> 2.8) | |
sqlite3 (1.3.9) | |
thor (0.19.1) | |
thread_safe (0.3.4) | |
tilt (1.4.1) | |
- treetop (1.4.15) | |
- polyglot | |
- polyglot (>= 0.3.1) | |
turbolinks (2.3.0) | |
coffee-rails | |
tzinfo (1.2.2) | |
@@ -108,18 +134,26 @@ | |
uglifier (2.5.3) | |
execjs (>= 0.3.0) | |
json (>= 1.8.0) | |
+ web-console (2.0.0.beta3) | |
+ activemodel (~> 4.0) | |
+ binding_of_caller (= 0.7.3.pre1) | |
+ railties (~> 4.0) | |
+ sprockets-rails (>= 2.0, < 4.0) | |
PLATFORMS | |
ruby | |
DEPENDENCIES | |
+ byebug | |
coffee-rails (~> 4.0.0) | |
jbuilder (~> 2.0) | |
jquery-rails | |
- rails (= 4.1.5) | |
- sass-rails (~> 4.0.3) | |
+ rails (= 4.2.0.beta1) | |
+ rails-html-sanitizer (~> 1.0) | |
+ sass-rails (~> 5.0.0.beta1) | |
sdoc (~> 0.4.0) | |
spring | |
sqlite3 | |
turbolinks | |
uglifier (>= 1.3.0) | |
+ web-console (~> 2.0.0.beta2) | |
Only in 4.2.0.beta1/bin: setup | |
diff -ur 4.1.5/config/application.rb 4.2.0.beta1/config/application.rb | |
--- 4.1.5/config/application.rb 2014-08-22 15:14:46.000000000 +0900 | |
+++ 4.2.0.beta1/config/application.rb 2014-08-22 15:15:19.000000000 +0900 | |
@@ -19,5 +19,8 @@ | |
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. | |
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] | |
# config.i18n.default_locale = :de | |
+ | |
+ # For not swallow errors in after_commit/after_rollback callbacks. | |
+ config.active_record.raise_in_transactional_callbacks = true | |
end | |
end | |
diff -ur 4.1.5/config/boot.rb 4.2.0.beta1/config/boot.rb | |
--- 4.1.5/config/boot.rb 2014-08-22 15:14:46.000000000 +0900 | |
+++ 4.2.0.beta1/config/boot.rb 2014-08-22 15:15:19.000000000 +0900 | |
@@ -1,4 +1,3 @@ | |
-# Set up gems listed in the Gemfile. | |
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) | |
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) | |
+require 'bundler/setup' # Set up gems listed in the Gemfile. | |
diff -ur 4.1.5/config/environments/development.rb 4.2.0.beta1/config/environments/development.rb | |
--- 4.1.5/config/environments/development.rb 2014-08-22 15:14:46.000000000 +0900 | |
+++ 4.2.0.beta1/config/environments/development.rb 2014-08-22 15:15:19.000000000 +0900 | |
@@ -27,6 +27,10 @@ | |
# number of complex assets. | |
config.assets.debug = true | |
+ # Asset digests allow you to set far-future HTTP expiration dates on all assets, | |
+ # yet still be able to expire them through the digest params. | |
+ config.assets.digest = true | |
+ | |
# Adds additional error checking when serving assets at runtime. | |
# Checks for improperly declared sprockets dependencies. | |
# Raises helpful error messages. | |
diff -ur 4.1.5/config/environments/production.rb 4.2.0.beta1/config/environments/production.rb | |
--- 4.1.5/config/environments/production.rb 2014-08-22 15:14:46.000000000 +0900 | |
+++ 4.2.0.beta1/config/environments/production.rb 2014-08-22 15:15:19.000000000 +0900 | |
@@ -16,10 +16,10 @@ | |
# Enable Rack::Cache to put a simple HTTP cache in front of your application | |
# Add `rack-cache` to your Gemfile before enabling this. | |
- # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. | |
+ # For large-scale production use, consider using a caching reverse proxy like NGINX, varnish or squid. | |
# config.action_dispatch.rack_cache = true | |
- # Disable Rails's static asset server (Apache or nginx will already do this). | |
+ # Disable Rails's static asset server (Apache or NGINX will already do this). | |
config.serve_static_assets = false | |
# Compress JavaScripts and CSS. | |
@@ -29,20 +29,21 @@ | |
# Do not fallback to assets pipeline if a precompiled asset is missed. | |
config.assets.compile = false | |
- # Generate digests for assets URLs. | |
+ # Asset digests allow you to set far-future HTTP expiration dates on all assets, | |
+ # yet still be able to expire them through the digest params. | |
config.assets.digest = true | |
- # `config.assets.precompile` has moved to config/initializers/assets.rb | |
+ # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb | |
# Specifies the header that your server uses for sending files. | |
- # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache | |
- # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx | |
+ # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache | |
+ # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX | |
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. | |
# config.force_ssl = true | |
- # Set to :debug to see everything in the log. | |
- config.log_level = :info | |
+ # Set to :info to decrease the log volume. | |
+ config.log_level = :debug | |
# Prepend all log lines with the following tags. | |
# config.log_tags = [ :subdomain, :uuid ] | |
@@ -56,10 +57,6 @@ | |
# Enable serving of images, stylesheets, and JavaScripts from an asset server. | |
# config.action_controller.asset_host = "http://assets.example.com" | |
- # Precompile additional assets. | |
- # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. | |
- # config.assets.precompile += %w( search.js ) | |
- | |
# Ignore bad email addresses and do not raise email delivery errors. | |
# Set this to true and configure the email server for immediate delivery to raise delivery errors. | |
# config.action_mailer.raise_delivery_errors = false | |
@@ -71,9 +68,6 @@ | |
# Send deprecation notices to registered listeners. | |
config.active_support.deprecation = :notify | |
- # Disable automatic flushing of the log to improve performance. | |
- # config.autoflush_log = false | |
- | |
# Use default logging formatter so that PID and timestamp are not suppressed. | |
config.log_formatter = ::Logger::Formatter.new | |
diff -ur 4.1.5/config/initializers/assets.rb 4.2.0.beta1/config/initializers/assets.rb | |
--- 4.1.5/config/initializers/assets.rb 2014-08-22 15:14:46.000000000 +0900 | |
+++ 4.2.0.beta1/config/initializers/assets.rb 2014-08-22 15:15:19.000000000 +0900 | |
@@ -3,6 +3,9 @@ | |
# Version of your assets, change this if you want to expire all your assets. | |
Rails.application.config.assets.version = '1.0' | |
+# Add additional assets to the asset load path | |
+# Rails.application.config.assets.paths << Emoji.images_path | |
+ | |
# Precompile additional assets. | |
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. | |
# Rails.application.config.assets.precompile += %w( search.js ) | |
diff -ur 4.1.5/config/initializers/cookies_serializer.rb 4.2.0.beta1/config/initializers/cookies_serializer.rb | |
--- 4.1.5/config/initializers/cookies_serializer.rb 2014-08-22 15:14:46.000000000 +0900 | |
+++ 4.2.0.beta1/config/initializers/cookies_serializer.rb 2014-08-22 15:15:19.000000000 +0900 | |
@@ -1,3 +1,3 @@ | |
# Be sure to restart your server when you modify this file. | |
-Rails.application.config.action_dispatch.cookies_serializer = :json | |
\ No newline at end of file | |
+Rails.application.config.action_dispatch.cookies_serializer = :json | |
diff -ur 4.1.5/config/secrets.yml 4.2.0.beta1/config/secrets.yml | |
--- 4.1.5/config/secrets.yml 2014-08-22 15:14:46.000000000 +0900 | |
+++ 4.2.0.beta1/config/secrets.yml 2014-08-22 15:15:19.000000000 +0900 | |
@@ -11,10 +11,10 @@ | |
# if you're sharing your code publicly. | |
development: | |
- secret_key_base: 707cb85d058357a87c0903b41c4c5078aafb502ffd81606147a6f70d0b7b9930f1eb707a1f66d17063db555a2f6198bfff1ec3a364273e0f74c9be814e09eecd | |
+ secret_key_base: f63c9a1cf4311f27db183ab1c906913173a7bf3f65e017b837b5d56c016881b9d4bcfc5ed9fa4549a9aff2af84adc488d9d9299eb15a55122631ffe64e7214ee | |
test: | |
- secret_key_base: 735add4082b6b2e7c330af729e59c53ad0ddeacdf6c97c989d9e206652d5bf3cded58bb0f347b4d7a96ccfb1571527ef49d1a3311fc0d275e57cd4fc69f49e77 | |
+ secret_key_base: be1e1b48f585c1d362fac5dbfdd0c81ca7a115c6541f86cf71a8727c15efb271124e084a6e0d06cd202441183559dbc0bb049a31e15d684f1e3f4fb06a3d743a | |
# Do not keep production secrets in the repository, | |
# instead read values from the environment. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment