diff options
| -rw-r--r-- | Gemfile | 11 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 11 | ||||
| -rw-r--r-- | activerecord/activerecord.gemspec | 2 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 2 | ||||
| -rw-r--r-- | rails.gemspec | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb | 12 |
8 files changed, 17 insertions, 30 deletions
@@ -2,17 +2,12 @@ source 'https://rubygems.org' gemspec -gem 'arel', github: 'rails/arel', branch: 'master' - gem 'mocha', '~> 0.13.0', require: false -gem 'rack-test', github: 'brynary/rack-test' gem 'rack-cache', '~> 1.2' gem 'bcrypt-ruby', '~> 3.0.0' -gem 'jquery-rails', '~> 2.2.0', github: 'rails/jquery-rails' +gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' -gem 'coffee-rails', github: 'rails/coffee-rails' - -gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders', branch: 'master' +gem 'coffee-rails', '~> 4.0.0.beta1' # Needed for compiling the ActionDispatch::Journey parser gem 'racc', '>=1.4.6', require: false @@ -21,8 +16,6 @@ gem 'racc', '>=1.4.6', require: false # it being automatically loaded by sprockets gem 'uglifier', require: false -gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master' - group :doc do gem 'sdoc', github: 'voloko/sdoc' gem 'redcarpet', '~> 2.2.2', platforms: :ruby diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 195b427449..a135b3c91f 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1256,12 +1256,11 @@ * `:conditions` becomes `:where`. * `:include` becomes `:includes`. - The code to implement the deprecated features has been moved out to - the `activerecord-deprecated_finders` gem. This gem is a dependency - of Active Record in Rails 4.0. It will no longer be a dependency - from Rails 4.1, but if your app relies on the deprecated features - then you can add it to your own Gemfile. It will be maintained by - the Rails core team until Rails 5.0 is released. + The code to implement the deprecated features has been moved out to the + `activerecord-deprecated_finders` gem. This gem is a dependency of Active + Record in Rails 4.0, so the interface works out of the box. It will no + longer be a dependency from Rails 4.1 (you'll need to add it to the + `Gemfile` in 4.1), and will be maintained until Rails 5.0. *Jon Leighton* diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec index d523c1eca1..89a62f0873 100644 --- a/activerecord/activerecord.gemspec +++ b/activerecord/activerecord.gemspec @@ -24,6 +24,6 @@ Gem::Specification.new do |s| s.add_dependency 'activesupport', version s.add_dependency 'activemodel', version - s.add_dependency 'arel', '~> 3.0.2' + s.add_dependency 'arel', '~> 4.0.0.beta1' s.add_dependency 'activerecord-deprecated_finders', '~> 0.0.3' end diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 64b23996e8..819980eac9 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.rdoc_options.concat ['--encoding', 'UTF-8'] - s.add_dependency 'i18n', '~> 0.6' + s.add_dependency 'i18n', '~> 0.6.2' s.add_dependency 'multi_json', '~> 1.3' s.add_dependency 'tzinfo', '~> 0.3.33' s.add_dependency 'minitest', '~> 4.2' diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index 915a008a92..f5d7f1bfe2 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -49,7 +49,7 @@ Rails 4.0 no longer supports loading plugins from `vendor/plugins`. You must rep ### Active Resource -Rails 4.0 extracted Active Resource to its our gem. If you still need the feature you can add the [Active Resource gem](https://github.com/rails/activeresource) in your Gemfile. +Rails 4.0 extracted Active Resource to its own gem. If you still need the feature you can add the [Active Resource gem](https://github.com/rails/activeresource) in your Gemfile. ### Active Model diff --git a/rails.gemspec b/rails.gemspec index 770847e87e..8a5d042361 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |s| s.add_dependency 'actionmailer', version s.add_dependency 'railties', version - s.add_dependency 'bundler', '>= 1.2.2', '< 2.0' + s.add_dependency 'bundler', '>= 1.3.0', '< 2.0' s.add_dependency 'sprockets-rails', '~> 2.0.0.rc3' end diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 3080b055a0..4e703151ba 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -196,9 +196,8 @@ module Rails # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sprockets-rails', '~> 2.0.0.rc3' - gem 'sass-rails', '~> 4.0.0.beta' - gem 'coffee-rails', '~> 4.0.0.beta' + gem 'sass-rails', '~> 4.0.0.beta1' + gem 'coffee-rails', '~> 4.0.0.beta1' # See https://github.com/sstephenson/execjs#readme for more supported runtimes #{javascript_runtime_gemfile_entry} diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb b/railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb index c78bfb7f63..ef360470a3 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb +++ b/railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb @@ -1,9 +1,5 @@ -gemfile = File.expand_path('../../../../Gemfile', __FILE__) +# Set up gems listed in the Gemfile. +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__) -if File.exist?(gemfile) - ENV['BUNDLE_GEMFILE'] = gemfile - require 'bundler' - Bundler.setup -end - -$:.unshift File.expand_path('../../../../lib', __FILE__)
\ No newline at end of file +require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) +$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__) |