Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
This comparison is big! We’re only showing the most recent 250 commits
Commits on Feb 11, 2013
Luis Vasconcellos fix a typo on the engine guide 2098525
@steveklabnik steveklabnik Merge pull request #9245 from vasconcelloslf/fix_guide_typo
fix a typo on the engine guide
17a69c7
@tenderlove tenderlove fixing bit string test cdd293c
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9221 from thenickcox/image_alt_attribute
Improve img alt attribute for screen readers
7596792
@olliwer olliwer Changed update_record to use prepared statements. a53935d
@carlosantoniodasilva carlosantoniodasilva Add changelog entry for #9177 [ci skip]
Add test:all and test:all:db rake tests to speed up full test runs.
7765ee0
@carlosantoniodasilva carlosantoniodasilva Improve changelog entry from #9221 [ci skip] b1c72a3
@lest lest define Active Record Store accessors in a module
Allow store accessors to be overrided like other attribute methods,
e.g.:

    class User < ActiveRecord::Base
      store :settings, accessors: [ :color, :homepage ], coder: JSON

      def color
        super || 'red'
      end
    end
9dfef5a
@senny senny remove trailing whitespace from engines guide fdf04fe
@senny senny fix the example code in the engines guide. closes #8583. 9e23399
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9247 from lest/store-module
define Active Record Store accessors in a module
65dde28
@carsonmcdonald carsonmcdonald Fix typo.
[ci skip]
4e02a69
@steveklabnik steveklabnik Merge pull request #9250 from senny/8583_fix_engines_documentation_ex…
…ample_code

fix example code in engines guide
67444ba
Commits on Feb 12, 2013
@tenderlove tenderlove test for regression from a712e08 0268b5d
@ranjaykrishna ranjaykrishna reverted back our changes and added in the new define_method a69345e
@ranjaykrishna ranjaykrishna checking in the abstractions for valid type checking: c321b30
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9206 from ranjaykrishna/use_define_method
Use define method instead of class_eval
1fc6876
@americos americos Detail Ruby 1.8 ships with TestUnit and Ruby 1.9 with MiniTest 6530d42
@tenderlove tenderlove Merge pull request #9204 from ranjaykrishna/col-prob
schema dumper tests now conducted by ActiveRecord::Base.Connection
f8c8ad5
@tjh tjh Correct bullet content line wrapping
The `:prefix` bullet content was not properly wrapping,
dropping to the following line because the additional
content was not indented properly. With this change, it
will now display properly the way `:discard_type` does.
09d7ead
Commits on Feb 13, 2013
@spastorino spastorino Avoid to_sym calls 5d58948
@kubabrecka kubabrecka incorrect content of models/comment.rb after 'rails generate' 0f0803f
Rafael Mendonça França Revert "incorrect content of models/comment.rb after 'rails generate'"
This reverts commit 0f0803f.

Reason: The content was correct since attr_accessible was removed from
rails master.
3a388da
@bensie bensie Don't call after_commit when creating through an association and save…
… fails, fixes #5802
caabed6
@steveklabnik steveklabnik Merge pull request #9115 from bensie/issue_5802
Don't call after_commit when creating through an association and save fails, fixes #5802
f36b80b
Commits on Feb 14, 2013
@warnickr warnickr 9253: Before writing a numeric attribute value, ActiveRecord does an …
…implicit

conversion of boolean types (true => 1 and false => 0). If the numeric value
being assigned is a BigDecimal, then ActiveRecord compares a BigDecimal to
true and false. This is known to be very slow in Ruby 1.9.3.
0c0ee13
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9254 from warnickr/9253_avoid_bigdecimal_performa…
…nce_issue

Before writing a numeric attribute value, ActiveRecord does an implicit conversion of boolean types (true => 1 and false => 0). If the numeric value being assigned is a BigDecimal, then ActiveRecord compares a BigDecimal to true and false.

This is known to be very slow in Ruby 1.9.3 (see http://www.ruby-forum.com/topic/4409452 and https://bugs.ruby-lang.org/issues/7645#change-35188).

The Ruby core team has implemented a fix for this issue that will be included in Ruby 2, but they appear to have no intention of back-porting this fix to Ruby 1.9.3. In my case, the performance impact of this issue was enormous (200% - 300% performance hit) for some of the pages in my application.

See c75b5a8 applied to 3-2-stable branch for more reasoning and a benchmark.
1fd7830
@rubys rubys Make valid_type? public 5d528f8
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9283 from rubys/master
Make valid_type? public
9aa96f7
@rahul100885 rahul100885 Bump rack-test dependency to 0.6.2 1c0ace4
@guilleiguaran guilleiguaran Merge pull request #9285 from rahul100885/master
Bump rack-test dependency to 0.6.2
a254e4b
@senny senny don't cache invalid subsets when preloading hmt associations.
closes #8423.
4a4ff50
@rafaelfranca rafaelfranca Merge pull request #9252 from senny/8423_hmt_preloading_bug
don't cache invalid subsets when preloading hmt associations
cdbd64d
@tenderlove tenderlove Merge pull request #8704 from senny/remove_regexp_global_from_url_for
replace regexp global in #url_for
9d023c8
Commits on Feb 15, 2013
@wangjohn wangjohn Added extra comment when a migration already exists of the same name.
User should know that he can overwrite the previous migration. This
comes in handy especially when generating models which were previously
created then removed.
b4c99ea
@jeremy jeremy Merge pull request #9298 from wangjohn/add_documentation_to_migration…
…_collision

Added extra comment when a migration already exists of the same name
a159f47
@jonleighton jonleighton Revert "Merge pull request #9206 from ranjaykrishna/use_define_method"
This reverts commit 1fc6876, reversing
changes made to 0268b5d.

Reason: failing test

  1) Error:
test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest):
NoMethodError: undefined method `column' for
    test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in
`test_valid_column'
8aa4603
@jonleighton jonleighton Revert "Revert "Merge pull request #9206 from ranjaykrishna/use_defin…
…e_method""

This reverts commit 8aa4603.

Reverting the revert because I reverted the wrong thing! Fail.
2f99779
@jonleighton jonleighton Revert "checking in the abstractions for valid type checking:"
This reverts commit c321b30.

Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

Reason: failing test

  1) Error:
test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest):
NoMethodError: undefined method `column' for
    test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in
`test_valid_column'
c65b076
@jonleighton jonleighton Revert "Make valid_type? public"
This reverts commit 5d528f8.

Relates to f8c8ad5 which is also getting reverted due to failing test.
520a16c
@vijaydev vijaydev copy edits [ci skip] 2008fe6
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	guides/source/upgrading_ruby_on_rails.md
0c14544
@jonleighton jonleighton Remove valid_type? method
It was supposed to be removed by the preceding two reversions but I did
them in the wrong order.
7d93d91
Commits on Feb 16, 2013
@wangjohn wangjohn Removed an old require of an MD5 digest which is no longer used. fcdfb2b
@fxn fxn copy-edits RDoc in fba496f
This revision makes the terminology uniform with the rest of the file.
In general we describe these methods in terms of the adapter, rather
than the database. (As a side note, if we wanted to refer to the
database we would write "PostgreSQL".)
69d08eb
@fxn fxn Merge pull request #9307 from wangjohn/remove_unneeded_md5_digest
Removed an old require of an MD5 digest which is no longer used.
7a32c63
Commits on Feb 17, 2013
@pixeltrix pixeltrix Add CHANGELOG entry for 41ff6a1
[ci skip]
bd328f4
@take take add tests for ActiveRecord::Base#create 2db91fb
@guilleiguaran guilleiguaran Merge pull request #9312 from Takehiro-Adachi/add_tests_for_ar_create
Add test for ActiveRecord::Base#create
ef5d93d
@bkzl bkzl Return false on toggle on error pages 5015368
@guilleiguaran guilleiguaran Merge pull request #9313 from bkzl/return-false-on-toggle-on-error-pages
Return false in toggle function on error pages
b04c81d
Commits on Feb 18, 2013
@amatsuda amatsuda Gist URLs are now namespaced 57b0ae8
@amatsuda amatsuda Bump up minitest dependency and remove our own reinvented version of …
…ParallelEach
18c57c7
@balexand balexand Document changes in #7968 0dcecd2
@rafaelfranca rafaelfranca Merge pull request #9317 from balexand/patch-1
Document changes from #7968 in Upgrading Guide
a2322a5
@steveklabnik steveklabnik Add headings to rake routes table a627762
Commits on Feb 19, 2013
@fxn fxn Merge pull request #9318 from steveklabnik/router_headings
Add headings to rake routes table
8fd17e0
@steveklabnik steveklabnik Add message when you have no routes defined.
Print a message in both `rake routes` and at GET "/rails/info/routes"
that lets you know you have no routes defined, as well as linking to the
Rails Guide on the topic.
d3b836a
@fxn fxn Merge pull request #9316 from steveklabnik/no_routes
Print message on stderr when no routes are defined.
33310fb
@steveklabnik steveklabnik use strip_heredoc to keep indentation consistent.
Thanks @sikachu. :heart:
13c9195
@steveklabnik steveklabnik Use strip_heredoc in the tests as well.
Thanks @sikachu. :sweat_smile:
f4f0264
@fxn fxn editorial tweaks 40a1027
@steveklabnik steveklabnik Duck typing is hard. Add header to HtmlTableFormatter.
Somehow I missed this method, which was then throwing an error
when viewing routes as HTML.

Make @rubys happy: ✔
0122134
@pixeltrix pixeltrix Revert "Deprecate the `eager_load_paths` configuration"
Because of the possibility of lib being unintentionally eager loaded
it's been agreed that we'll leave autoload paths and eager load paths
separate for Rails 4.0.

This reverts commit 0757b33.

Conflicts:
	railties/CHANGELOG.md
9d9b22f
@pixeltrix pixeltrix Don't unhook autoloading in production
Whilst autoloading is known to be not threadsafe, leaving it in place
is a softer solution than failing hard when an application is deployed.

Many older applications will have paths added to `autoload_paths` and
ideally these should be eagerly loaded to be threadsafe. However one
of these paths is quite often lib which could lead to unintended
consequences due to the 'junk drawer' nature of this directory.

Developers should refrain from adding paths to `autoload_paths` or
`eager_load_paths` and use custom folders inside app for code that
needs to be eagerly loaded and use `require` or `require_dependency`
to explicitly load code from other locations.
a8bf129
@pixeltrix pixeltrix Remove config.autoload_paths from config/application.rb
Most application developers shouldn't be adding paths to
`config.autoload_paths` as it won't be eagerly loaded so
remove it from the generated config/application.rb file.

If a developer does want to autoload from paths outside of the app
directory then they should add the path to `config.eager_load_paths`
as these paths are also autoloaded as well.
212ef52
@mfilej mfilej Require AS deps in ActionDispatch::Http::URL
Allows us to use url_for and friends in isolation.
a66ce98
@fxn fxn Merge pull request #9321 from mfilej/action-dispatch-http-url-requires
Require ActiveSupport dependencies in ActionDispatch::Http::URL
7e7c9b3
@carlosantoniodasilva carlosantoniodasilva Add missing require to routes inspector f994530
@carlosantoniodasilva carlosantoniodasilva Fix AP tests related to routes inspector output and the new column ti…
…tles
66237cd
@carlosantoniodasilva carlosantoniodasilva Fix rake routes output in railties test a700917
@spastorino spastorino InvalidMessage is in ActiveSupport::MessageEncryptor namespace
Closes #9302
00147c8
@take take delete duplicated tests in AR base_test.rb
These are duplicated with the tests which are in relations_test.rb
6797778
John J Wang Raise an error when query methods have blank arguments, and when blan…
…k arguments are meaningless.
4033c50
@rafaelfranca rafaelfranca Merge pull request #9258 from wangjohn/blank_argument_errors_in_arel
Raising an error when query methods have blank arguments.
8991083
@fxn fxn small tweaks in the AR CHANGELOG 2abf217
@fxn fxn moves a CHANGELOG entry from AR to AP ff259b5
@steveklabnik steveklabnik Merge pull request #9315 from Takehiro-Adachi/remove-unecessary-tests…
…-from-ar-base_testrb

delete duplicated tests in AR base_test.rb
b749124
@fxn fxn fixes a typo in the migrations guide 26eb1e4
@fxn fxn s/revertible/reversible/ 2769180
@acapilleri acapilleri added more accurate test for add_on_empty
with the current tests, if delete the assignment of is_empty in add_on_empty method
the tests not fail. With this test, if we delete is_empty, the test fails
40c1ee8
@steveklabnik steveklabnik Merge pull request #9324 from acapilleri/add_on_empty
added more accurate test for add_on_empty
45547a1
Commits on Feb 20, 2013
@amatsuda amatsuda Better not use tab chars in the generator template c2c203c
@bdmac bdmac Fix time_zone_options_for_select to not mutate TimeZones array
Previous implementation of time_zone_options_for_select did not dup the
ActiveSupport::TimeZone.all array.  When :priority_zones were provided
the method would reject! the zones from the memoized TimeZones array
thus affecting future requests to the server.  Essentially whatever
zones were specified as :priority_zones would show up for the first
request but then disappear from the time zone options on future
requests.
5c73f0d
@robertomiranda robertomiranda Improve upgrading guide with ActionDispatch::BestStandardsSupport rem…
…oval
cb5ccf4
@guilleiguaran guilleiguaran Merge pull request #9331 from robertomiranda/upgrading-guide
Improve upgrading guide with ActionDispatch::BestStandardsSupport remova...
862e751
@pixeltrix pixeltrix Merge pull request #9330 from bdmac/time_zone_select_dup
Fix time_zone_options_for_select to not mutate TimeZones array
c3f1b1d
@senny senny descriptive error message when AR adapter was not found. Closes #7313. 0a6b61a
@fxn fxn Merge pull request #8060 from senny/7313_descriptive_error_message_fo…
…r_missing_adapter

descriptive error message when AR adapter was not found. Closes #7313
e5c26ee
@rafaelfranca rafaelfranca Whitespace :heart: and hash syntax change e1456ad
@sikachu sikachu Remove XML Parser from ActionDispatch
If you want an ability to parse XML parameters, please install
`actionpack-xml_parser` gem.
c9909db
@guilleiguaran guilleiguaran Merge pull request #9328 from sikachu/ps-remove-xml-parser
Remove XML Parser from ActionDispatch
ebae71a
@hone hone standardize database_configuration to a hash
make connection_url_to_hash a class method

This als prevents loading database.yml if it doesn't exist
but DATABASE_URL does
4bdaf95
@hone hone test DATABASE_URL without database.yml around 44298c3
@hone hone run the load_structure test in the test environment e3f5d02
@hone hone update changelog b1de189
@senny senny move config.assets.precompile into config/application.rb 304f4d4
@rafaelfranca rafaelfranca Merge pull request #9120 from hone/db_migrate_with_database_url
fix rake db:migrate when used with ENV['DATABASE_URL']
3a0b6c8
@dasch dasch Extract dependency tracking from Digestor 889bf19
@dasch dasch Allow registering custom dependency trackers 1879a33
@dasch dasch Use a thread safe hash 9ca8c63
@dasch dasch Return an empty array if no tracker is found 4452849
@dasch dasch Rename ErbTracker to ERBTracker 5070370
@dasch dasch Register trackers on extensions, not handlers ec23296
@wangjohn wangjohn Reduced memory leak problem in transactions by lazily updating AR obj…
…ects with new transaction state. If AR object has a callback, the callback will be performed immediately (non-lazily) so the transaction still has to keep records with callbacks.
67d8bb9
@wangjohn wangjohn Added comments about the check_empty_arguments method which is called
for query methods in a where_clause. Also, modified the CHANGELOG entry
because it had false information and added tests.
d49f862
@rafaelfranca rafaelfranca Merge pull request #9341 from senny/move_precompiled_asset_config_to_…
…application

move config.assets.precompile into config/application.rb
b85f63b
@rafaelfranca rafaelfranca Merge pull request #9068 from wangjohn/transaction_callback_patch
Reduced memory leak problem in transactions by lazily updating AR objects
82a5432
@hone hone make type_cast_value a class level method 7099194
@rafaelfranca rafaelfranca Merge pull request #9342 from hone/db_migrate_with_database_url
Fix ActiveRecord::ConnectionAdapters::ConnectionSpecification::ResolverTest
a5bf96a
@rafaelfranca rafaelfranca Merge pull request #9332 from wangjohn/adding_documentation_to_error_…
…raising_in_query_methods

Tests to make sure empty arguments in WhereChain raise errors
7bae72c
@senny senny reserve index name chars for internal rails operations
Some adapter (SQLite3) need to perform renaming operations to support
the rails DDL. These rename prefixes operate with prefixes. When an
index name already uses up the full space provieded by
`index_name_length` these internal operations will fail. This patch
introduces `allowed_index_name_length` which respects the amount of
characters used for internal operations. It will always be <=
`index_name_length` and every adapter can define how many characters
need to be reserved.
cca4352
@senny senny reserve less chars for internal sqlite3 operations 72ca2d7
@rafaelfranca rafaelfranca Merge pull request #8613 from senny/8264_character_limit_for_indices
deal with long index names and internal sqlite3 operations
92949d2
@fxn fxn revises the documentation of AR::Base.cache_timestamp_format [ci skip] 1b776b9
@fxn fxn moves the new :nsec date format to the Active Support changelog [ci s…
…kip]
20ed3e0
@wangjohn wangjohn Renaming the check_empty_arguments method to something more descriptive.
The function is now called has_arguments? so that it's easier to tell
that it's just checking to see if the args are blank or not.
7b30cec
@senny senny also rename indexes when a table or column is renamed
When a table or a column is renamed related indexes kept their name. This will lead to confusing names. This patch renames related indexes when a column or a table is renamed. Only indexes with names generated by rails will be renamed. Indexes with custom names will not be renamed.
39eef1a
@rafaelfranca rafaelfranca Merge pull request #8645 from senny/rename_index_on_rename_column
also rename indexes when a table or column is renamed
0916f88
@senny senny unify AR changelog entries [ci skip] de615b3
@rafaelfranca rafaelfranca Merge pull request #9344 from senny/changelog_cleanup
unify AR changelog entries [ci skip]
73988bc
@rafaelfranca rafaelfranca Skip failing test and add a FIXME note d3563bd
@spastorino spastorino Revert "Merge pull request #4803 from lucascaton/master"
This reverts commit bb842e8, reversing
changes made to 40c287c.
This was causing issues in one of our apps we just upgraded.
ActionController::RoutingError: No route matches [GET]
"/images/favicon.ico"
favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned
'/favicon.ico'
Browsers by default look for favicon.ico in the root directory

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_view/helpers/asset_tag_helper.rb
6871bd9
@fxn fxn database.yml -> config/database.yml [ci skip] c5115b0
@fxn fxn adds an example in the docs of #not with multiple conditions [ci skip] 6b42e0f
@fxn fxn puts a lambda around a default scope [ci skip] 36113d0
@fxn fxn removes some remaining relation bang methods documentation [ci skip] 3ff639a
@fxn fxn removes relation bang methods from the AR changelog [ci skip] aeb4592
@rafaelfranca rafaelfranca Merge pull request #9345 from wangjohn/change_name_of_query_method_ar…
…gument_checker_for_clarity

Renaming the check_empty_arguments method to something more descriptive.
24b7a76
@fxn fxn ActiveRecord -> Active Record [ci skip] 8fc6b9b
Marc Schütz Add more documentation for create_join_table.
Explain that it doesn't create indices by default and
that it also has a block form.
743d15b
Commits on Feb 21, 2013
@rafaelfranca rafaelfranca Fix warning 6614471
Marc Schütz Indent comment block by two spaces. 5b5f7a6
@senny senny remove uncommented railties boot_test.rb 2dffe37
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9352 from senny/remove_uncommented_boot_test
Remove commented railties boot_test.rb
34c133a
@fxn fxn Merge pull request #9348 from schuetzm/doc_no_indices_with_create_joi…
…n_table

Add more documentation for create_join_table.
b0fa9b5
@fabiokr fabiokr Rack::Test::UploadedFile is a permitted scalar fa9ec0a
@senny senny multiple actions for :on option with `after_commit` and `after_rollback`
Closes #988.
d98763a
@NARKOZ NARKOZ remove assigned but unused variable warning 5e52905
@fxn fxn Merge pull request #9357 from fabiokr/rack_test_uploaded_file
Rack::Test::UploadedFile is a permitted scalar
91d1ac0
@steveklabnik steveklabnik Merge pull request #9354 from NARKOZ/remove-warnings
remove assigned but unused variables
ea544e9
@iwiznia iwiznia Update railties/lib/rails/application/configuration.rb
Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"]
d0dfe16
@iwiznia iwiznia Update railties/lib/rails/application/configuration.rb
Better comment for database_configuration method
7b6f2a0
@fxn fxn Merge pull request #9358 from iwiznia/patch-1
Update railties/lib/rails/application/configuration.rb
c1b4b3b
@fxn fxn tweaks to the AP changelog [ci skip] e2096e8
@carlosantoniodasilva carlosantoniodasilva Remove not necessary changelog about time zone array mutation
This seemed to be introduced in master by
9dd64f2, so there's no need to add a
changelog entry for fixing it.

[ci skip]
b20823b
@carlosantoniodasilva carlosantoniodasilva Fix test name and refactor fake timezones creation in form options test 1323374
@carlosantoniodasilva carlosantoniodasilva Use Array Difference to calculate the zones array, instead of iterating
It's faster, and doesn't force us to dup the timezones array.
953e19e
@carlosantoniodasilva carlosantoniodasilva Use #grep to filter priority zones when a regexp is given b4051ed
@senny senny determine the match shorthand target early.
Closes #7554.

This patch determines the `controller#action` directly
in the `match` method when the shorthand syntax is used.
this prevents problems with namespaces and scopes.
c88ee76
@spastorino spastorino Use composition to figure out the forgery protection strategy 765006d
@spastorino spastorino This cache is not needed c60be72
@spastorino spastorino Revert "Revert "Merge pull request #4803 from lucascaton/master""
This reverts commit 6871bd9.
3893979
@pixeltrix pixeltrix Merge pull request #9361 from senny/improved_match_shorthand_syntax
determine the match shorthand target early.
f4b506f
@fxn fxn tweaks to the AP changelog [ci skip] 29927df
@fxn fxn completes pass over the AP changelog [ci skip] 4b48a75
@gaganawhad gaganawhad Added beginning_of_minute support to core_ext calculations for Time a…
…nd DateTime
6f380d3
@pixeltrix pixeltrix Merge pull request #9365 from gaganawhad/core-ext-beginning-of-minute
Added beginning_of_minute support to core_ext calculations for Time and DateTime
b5df957
Commits on Feb 22, 2013
@NARKOZ NARKOZ fix time_tag helper and update tests to not rely on dynamically gener…
…ated values

  Before `time_tag Date.today` will return `<time
  datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`.
  This commit fixes time_tag helper to use RFC-3339 full-date format
  (Y-m-d) in datetime attribute.
e8e92c7
@NARKOZ NARKOZ document setting custom datetime attribute for time_tag helper dc142f9
@pixeltrix pixeltrix Merge pull request #9334 from NARKOZ/time_tag
use ISO 8601 format in time_tag helper
31f807c
@hoffm hoffm Address edge case for number_to_human with units option.
ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when
the units hash does not contain the needed key, e.g. when the number provided is less
than the largest key provided.
4e3ceed
@steveklabnik steveklabnik Fix backwards compatibility with Rails 3 apps.
When we removed script/rails and introduced bin/rails, we accidentally
introduced a regression. If you install Rails 4 as a gem, then try to do
something in a Rails 3 application:

    $ rails g

This will throw the 'please type rails new foo' message rather than the
proper generator documentation message. This is because older apps don't
have bin/rails.

Therefore, we now *prefer* bin/rails, but still search for script/rails,
and exec the one we find.
c5a9c02
@eval eval Correct comment for (beginning|end)_of_minute eb1c5c4
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9384 from eval/documentation_of_minute
Correct comment for (beginning|end)_of_minute [ci skip]
e4c2a13
@steveklabnik steveklabnik Merge pull request #9347 from hoffm/number_to_human_bug
Address edge case for number_to_human with units option.
4ffcd83
@carlosantoniodasilva carlosantoniodasilva Changelog improvements, use 1.9 style hash in examples [ci skip] 1fbfdf5
@carlosantoniodasilva carlosantoniodasilva Move number_to_human test from AP to AS
Since all changes from #9347 are related to AS, it seems proper that the
test is placed there as well.
38f347a
Commits on Feb 23, 2013
@bouk bouk Fix debug helper not inspecting on Exception
The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534.
de47fc2
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9387 from boukevanderbijl/master
Fix debug helper not inspecting when it can't convert to YAML
cad397e
@senny senny forwardport #9388 rename/remove column preserves custom PK. 2d4e3fe
@senny senny rename_column_test.rb -> columns_test.rb to reveal intent.
I renamed the test to better communicate it's intention. Since it also tests:
  - add_column
  - remove_column
  - change_column
There is no reason to call it rename_column_test.
d03928c
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9389 from senny/forwardport_9388
Forwardport #9388 rename/remove column preserves custom PK.
2304855
@fxn fxn adds a missing LIMIT 1 in #take docs 87c029e
@rubys rubys guides/rails_guides moved up and out of the railties directory 549ced9
@guilleiguaran guilleiguaran Merge pull request #9393 from rubys/master
guides/rails_guides moved up and out of the railties directory
dcfa320
@fxn fxn registers the encrypted session store in the AP changelog c9c5656
Commits on Feb 24, 2013
@fxn fxn prevent minitest from printing a --seed run option
See the first FIXME comment in the patch for the rationale.
c15862a
@fxn fxn Revert "prevent minitest from printing a --seed run option"
Reason: on a second thought, minitest prints a seed as run option
regardless of the test order, and it actually calls srand, so
albeit it might be misleading I believe, it is the way it is and
should be left that way.

This reverts commit c15862a.
a628dd5
@senny senny also rename the test-case class inside columns_test.rb e7f0716
@rafaelfranca rafaelfranca Merge pull request #9394 from senny/actually_rename_the_test_case
also rename the test-case class inside columns_test.rb
da5ca96
@yahonda yahonda Oracle enhanced adapter shortens its name if it is longer than 30 bytes
because of Oracle database index length spec.
6fad6b5
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9395 from yahonda/oracle_index_length
Address failure test_rename_column_with_multi_column_index with Oracle
fb40358
@senny senny test case to prevent duplicated associations with custom PK.
closes #9201
96c1caf
@rafaelfranca rafaelfranca Merge pull request #9397 from senny/9201_duplicate_associations_with_…
…natural_key

test case to prevent duplicated associations with custom PK.
83a9efb
@steveklabnik steveklabnik Merge pull request #9356 from senny/988_multiple_actions_for_after_co…
…mmit

multiple actions for :on option with `after_commit` and `after_rollback`
c3d001b
@grosser grosser fix respond_to without blocks not working if one of the blocks is all 149e3cd
@senny senny Revert "move config.assets.precompile into config/application.rb"
This reverts commit 304f4d4.

As it turns out everything should behave as it did and we don't
need to move this configuration option.
6bd1cae
@guilleiguaran guilleiguaran Merge pull request #9398 from senny/revert_precompile_config_move
Revert "move config.assets.precompile into config/application.rb"
5fc3b87
@rafaelfranca rafaelfranca Do not type cast all the database url values.
We should only type cast when we need to use.

Related to 4b005fb
e54acf1
@rafaelfranca rafaelfranca Skip connection url test when the machine is using socket configuration.
The connection url parssing don't accept the socket option
d5ec8ef
@neerajdotname neerajdotname Updated doc to clarify about update_all and delete_all
delete_all will call callbacks if depdent option is specified as
:destroy. This behavior is not very clear from the documetation and
hence issue #7832 was raised.

closes #7832
5a7e6b6
@rafaelfranca rafaelfranca Mention the removal of attr_accessible and attr_protected in the upgr…
…ading guide

Point to the Protected Attributes gem to those who want a smoothly
upgrade path before to change to use Strong Parameters.

[ci skip]
d1c5f87
@rafaelfranca rafaelfranca Mention the extraction of Active Resource in the upgrading guide
[ci skip]
a06b1d0
@rafaelfranca rafaelfranca Merge pull request #9399 from neerajdotname/7832-dependent-option
Updated doc to clarify about update_all and delete_all
e06aae7
@guilleiguaran guilleiguaran Use sprockets-rails 2.0.0.rc3 in new apps 40111c5
@senny senny remove AR auto-explain (config.auto_explain_threshold_in_seconds)
We discussed that the auto explain feature is rarely used.
This PR removes only the automatic explain. You can still display
the explain output for any given relation using `ActiveRecord::Relation#explain`.

As a side-effect this should also fix the connection problem during
asset compilation (#9385). The auto explain initializer in the `ActiveRecord::Railtie`
forced a connection.
d3688e0
@fxn fxn Merge pull request #9400 from senny/remove_auto_explain_threshold_in_…
…seconds

remove config.auto_explain_threshold_in_seconds
d65376f
@sikachu sikachu Remove `--builder` option from `rails` command
Ability to use a custom builder by passing `--builder` (or `-b`) has
been removed. Consider using application template instead. See this
guide for more detail:
http://guides.rubyonrails.org/rails_application_templates.html
2da5ea1
@rafaelfranca rafaelfranca Merge pull request #9401 from sikachu/master-remove-builder-option
Remove `--builder` option from `rails` command
bce6cbd
@fxn fxn did a pass over the AM changelog [ci skip] 05857ec
@senny senny update the example for `after_commit` in the guides.
This is a follow up to #9356.
74bc0d0
@rafaelfranca rafaelfranca Merge pull request #9402 from senny/9356_update_guides
update the example for `after_commit` in the guides.
aff6232
@senny senny don't apply invalid ordering when preloading hmt associations.
closes #8663.

When preloading a hmt association there two possible scenarios:

1.) preload with 2 queries: first hm association, then hmt with id IN ()
2.) preload with join: hmt association is loaded with a join on the hm association

The bug was happening in scenario 1.) with a normal order clause on the hmt association.
The ordering was also applied when loading the hm association, which resulted in the error.

This patch only applies the ordering the the hm-relation if we are performing a join (2).
Otherwise the order will only appear in the second query (1).
4ef75b6
@rafaelfranca rafaelfranca Merge pull request #9391 from senny/8663_broken_hmt_ordering_with_inc…
…ludes

don't apply invalid ordering when preloading hmt associations.
99d3ec5
@fxn fxn did a pass over the AS changelog [ci skip] 1509844
@rafaelfranca rafaelfranca Make explicit the method will raise an exception
Taking the wise advice of @carlosantoniodasilva
5cbee32
@rafaelfranca rafaelfranca Remove warning 70ec7e0
@stopdropandrew stopdropandrew Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. cb100ca
@rafaelfranca rafaelfranca Merge pull request #9403 from stopdropandrew/TimeWithZone#to_r
Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.

Closes #9404
a066236
@rafaelfranca rafaelfranca Add more information to the CHANGELOG entry [ci skip] 51e9637
@carlosantoniodasilva carlosantoniodasilva Improve AR changelog [ci skip] 0bc301e
Commits on Feb 25, 2013
@steveklabnik steveklabnik Merge pull request #8815 from bogdan/simplified-to-json-args
AS JSON encoder: remove monkey patch of Array
15d693d
@guilleiguaran guilleiguaran Revert "Simplify code in AS json encoder"
This reverts commit 046e27a.
Check #8815 (comment) for
details.
3762ee0
@wangjohn wangjohn Raising an ActiveRecordError when one tries to use .touch(name) on a new
object that has not yet been persisted. This behavior follows the
precedent set by update_columns.
e52ff80
@guilleiguaran guilleiguaran Merge pull request #9320 from wangjohn/touch_handling_on_new_instances
Raising an ActiveRecordError when one tries to use touch on a new record object
3285c76
@wangjohn wangjohn Added documentation about how touch now throws an error when one tries
to use it on an unpersisted object.
3edccfb
@tenderlove tenderlove Merge pull request #9246 from Noemj/update_prepared_statements
Changed update to use prepared statements
45321a6
@senny senny update 4.0 release notes to reflect the removal of auto explain. 2777844
@fxn fxn Merge pull request #9411 from senny/add_auto_explain_removal_as_notab…
…le_change

update 4.0 release notes to reflect the removal of auto explain.
f80a6a5
@chris-baynes chris-baynes Keep second fraction when DateTime#change is called. fa891a2
@pixeltrix pixeltrix Merge pull request #9390 from chris-baynes/datetime_sec_fraction
Keep second fraction when DateTime#change is called.
d5141f2
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9409 from wangjohn/adding_documentation_to_touch
Added documentation to touch throwing an error
82c361e
@senny senny some minor AR changelog modifications [ci skip] 536b3f0
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9412 from senny/clean_ar_changelog
Some minor AR changelog modifications [ci skip]
4e286bf
@htanata htanata Improve `rake stats` for JavaScript and CoffeeScript.
Ignore block comments and calculates number of functions.
82e345d
@dhh dhh Merge pull request #9072 from htanata/statistics
Improve `rake stats` for JavaScript and CoffeeScript
add8b51
@dhh dhh Merge pull request #8530 from dasch/dependency-trackers
Custom dependency trackers for the template digestor
2b7b5f5
@rafaelfranca rafaelfranca :scissors: fa8a78d
@rafaelfranca rafaelfranca Use sass compressor as the default CSS compressor
With the new sprockets-rails we need to explicitly set the CSS
compressor.

See https://github.com/rails/sprockets-rails#changes-from-rails-3x
3eef1c7
@guilleiguaran guilleiguaran Revert "Use sass compressor as the default CSS compressor"
This reverts commit 3eef1c7.
The css compressor should be set in sass-rails plugin. Check
rails/sass-rails@339529f
for the fix.
ebe9590
@dhh dhh Preparing for 4.0.0.beta1 release c0bc9ce
@rafaelfranca rafaelfranca Do not use --local option when installing the gems 2eb8962
@yaotti yaotti Do not override attributes on `dup` by default scopes ec9aa3c
@rafaelfranca rafaelfranca Merge pull request #9197 from yaotti/fix/overriden-attr-on-dup
Fix: Overriding attributes on `dup` by default scopes
d8dd965
@rafaelfranca rafaelfranca New CHANGELOG entries always on top [ci skip] d100560
@josevalim josevalim Remove rack-test git dependency
The dependency was introduced in this commit:

002713c

which has been released a long time ago
6730272
@rafaelfranca rafaelfranca jquery-rails 2.2.1 was released cf863ce
@rafaelfranca rafaelfranca I released 0.0.3 some time ago efabcb4
@josevalim josevalim ar-deprecated_finders is already in the gemspec 612ebbc
@guilleiguaran guilleiguaran sprockets 2.0.0.rc3 is in rails gemspec already e75ce25
@fxn fxn AR loads activerecord-deprecated_finders, no need to add it to the Ge…
…mfile
3d303f5
@fxn fxn typo 25f90a4
@robertomiranda robertomiranda Remove sprockets-rails from the Gemfile generator ed6d8f0
@guilleiguaran guilleiguaran Merge pull request #9420 from robertomiranda/remove-sprockets-rails
Remove sprockets-rails from the Gemfile generator
46bb302
@fxn fxn removes redundant require
It turns out this file is required in active_record.rb.
a44a5e4
@guilleiguaran guilleiguaran Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile 94bebde
@rafaelfranca rafaelfranca Are was release bd36f18
@guilleiguaran guilleiguaran Bump i18n version to 0.6.2 80f7975
@jeremy jeremy Bundler 1.3.0 released. We prefer it for new binstub behavior. 202041e