# HG changeset patch # User Edho Arief # Date 1367938587 -32400 # Node ID 442c3ad459a746901c84781e0fdaa1bee000a15b # Parent d09bdb5904f5854beaf17da64eb3e63e9d025fd9 Welcome to rails 4 diff -r d09bdb5904f5 -r 442c3ad459a7 Gemfile --- a/Gemfile Thu Apr 04 11:26:02 2013 +0900 +++ b/Gemfile Tue May 07 23:56:27 2013 +0900 @@ -1,24 +1,25 @@ source 'https://rubygems.org' -gem 'rails', '~> 3.2.13' +gem 'rails', '~> 4.0.0.rc1' gem 'jquery-rails' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'mysql2', :platforms => :ruby -gem 'activerecord-jdbcmysql-adapter', :platforms => :jruby -gem 'jruby-openssl', :platforms => :jruby +gem 'mysql2', platforms: :ruby +gem 'activerecord-jdbcmysql-adapter', platforms: :jruby +gem 'jruby-openssl', platforms: :jruby +gem 'actionpack-page_caching' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', '~> 3.2.3' + gem 'sass-rails', '~> 4.0.0.rc1' - gem 'uglifier', '>= 1.0.3' - gem 'anjlab-bootstrap-rails', '>= 2.0', :require => 'bootstrap-rails' + gem 'uglifier' + gem 'anjlab-bootstrap-rails', require: 'bootstrap-rails' - gem 'therubyrhino', :platforms => :jruby + gem 'therubyrhino', platforms: :jruby end # To use ActiveModel has_secure_password @@ -29,8 +30,8 @@ group :standalone do # Use unicorn as the app server - gem 'unicorn', :platforms => :mri - gem 'puma', :platforms => [:rbx, :jruby] + gem 'unicorn', platforms: :mri + gem 'puma', platforms: [:rbx, :jruby] end # Deploy with Capistrano diff -r d09bdb5904f5 -r 442c3ad459a7 Gemfile.lock --- a/Gemfile.lock Thu Apr 04 11:26:02 2013 +0900 +++ b/Gemfile.lock Tue May 07 23:56:27 2013 +0900 @@ -1,119 +1,117 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) + actionmailer (4.0.0.rc1) + actionpack (= 4.0.0.rc1) mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) + actionpack (4.0.0.rc1) + activesupport (= 4.0.0.rc1) + builder (~> 3.1.0) erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionpack-page_caching (1.0.0) + actionpack (>= 4.0.0.beta, < 5.0) + activemodel (4.0.0.rc1) + activesupport (= 4.0.0.rc1) + builder (~> 3.1.0) + activerecord (4.0.0.rc1) + activemodel (= 4.0.0.rc1) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.0.rc1) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.2) activerecord-jdbc-adapter (1.2.9) activerecord-jdbcmysql-adapter (1.2.9) activerecord-jdbc-adapter (~> 1.2.9) jdbc-mysql (~> 5.1.0) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) - multi_json (~> 1.0) - anjlab-bootstrap-rails (2.3.1.1) + activesupport (4.0.0.rc1) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + anjlab-bootstrap-rails (2.3.1.2) railties (>= 3.0) sass (>= 3.2) - arel (3.0.2) + arel (4.0.0) + atomic (1.1.9) + atomic (1.1.9-java) bouncy-castle-java (1.5.0147) - builder (3.0.4) + builder (3.1.4) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - hike (1.2.1) - i18n (0.6.1) + hike (1.2.2) + i18n (0.6.4) jdbc-mysql (5.1.24) - journey (1.0.4) jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jruby-openssl (0.8.7) + jruby-openssl (0.8.8) bouncy-castle-java (>= 1.5.0147) - json (1.7.7) - json (1.7.7-java) kgio (2.8.0) mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.22) - multi_json (1.7.2) + mime-types (1.23) + minitest (4.7.4) + multi_json (1.7.3) mysql2 (0.3.11) - newrelic_rpm (3.6.0.78) + newrelic_rpm (3.6.1.88) polyglot (0.3.3) - puma (1.6.3) - rack (~> 1.2) - puma (1.6.3-java) - rack (~> 1.2) + puma (2.0.1) + rack (>= 1.1, < 2.0) + puma (2.0.1-java) + rack (>= 1.1, < 2.0) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.3) - rack + rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) - bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) - rack-ssl (~> 1.3.2) + rails (4.0.0.rc1) + actionmailer (= 4.0.0.rc1) + actionpack (= 4.0.0.rc1) + activerecord (= 4.0.0.rc1) + activesupport (= 4.0.0.rc1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.0.rc1) + sprockets-rails (~> 2.0.0.rc4) + railties (4.0.0.rc1) + actionpack (= 4.0.0.rc1) + activesupport (= 4.0.0.rc1) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - raindrops (0.10.0) + thor (>= 0.18.1, < 2.0) + raindrops (0.11.0) rake (10.0.4) - rdoc (3.12.2) - json (~> 1.4) - sass (3.2.7) - sass-rails (3.2.6) - railties (~> 3.2.0) + sass (3.2.8) + sass-rails (4.0.0.rc1) + railties (>= 4.0.0.beta, < 5.0) sass (>= 3.1.10) + sprockets-rails (~> 2.0.0.rc0) tilt (~> 1.3) - sprockets (2.2.2) + sprockets (2.9.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.0.0.rc4) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) therubyrhino (2.0.2) therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.4) thor (0.18.1) - tilt (1.3.6) + thread_safe (0.1.0) + atomic + tilt (1.4.0) treetop (1.4.12) polyglot polyglot (>= 0.3.1) tzinfo (0.3.37) - uglifier (1.3.0) + uglifier (2.0.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) unicorn (4.6.2) @@ -126,16 +124,17 @@ ruby DEPENDENCIES + actionpack-page_caching activerecord-jdbcmysql-adapter - anjlab-bootstrap-rails (>= 2.0) + anjlab-bootstrap-rails jquery-rails jruby-openssl mysql2 newrelic_rpm puma quiet_assets - rails (~> 3.2.13) - sass-rails (~> 3.2.3) + rails (~> 4.0.0.rc1) + sass-rails (~> 4.0.0.rc1) therubyrhino - uglifier (>= 1.0.3) + uglifier unicorn