aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #9403 from stopdropandrew/TimeWithZone#to_rRafael Mendonça França2013-02-243-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. Closes #9404
| * | | | | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.stopdropandrew2013-02-243-0/+19
| | | | | |
* | | | | | Remove warningRafael Mendonça França2013-02-241-1/+1
| | | | | |
* | | | | | Make explicit the method will raise an exceptionRafael Mendonça França2013-02-241-10/+10
|/ / / / / | | | | | | | | | | | | | | | Taking the wise advice of @carlosantoniodasilva
* | | | | did a pass over the AS changelog [ci skip]Xavier Noria2013-02-241-55/+61
| | | | |
* | | | | Merge pull request #9391 from senny/8663_broken_hmt_ordering_with_includesRafael Mendonça França2013-02-243-2/+13
|\ \ \ \ \ | | | | | | | | | | | | don't apply invalid ordering when preloading hmt associations.
| * | | | | don't apply invalid ordering when preloading hmt associations.Yves Senn2013-02-243-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | Merge pull request #9402 from senny/9356_update_guidesRafael Mendonça França2013-02-241-9/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | update the example for `after_commit` in the guides.
| * | | | | | update the example for `after_commit` in the guides.Yves Senn2013-02-241-9/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | This is a follow up to #9356.
* | | | | | did a pass over the AM changelog [ci skip]Xavier Noria2013-02-241-15/+35
| | | | | |
* | | | | | Merge pull request #9401 from sikachu/master-remove-builder-optionRafael Mendonça França2013-02-2412-183/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove `--builder` option from `rails` command
| * | | | | Remove `--builder` option from `rails` commandPrem Sichanugrist2013-02-2412-183/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge pull request #9400 from senny/remove_auto_explain_threshold_in_secondsXavier Noria2013-02-2414-223/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove config.auto_explain_threshold_in_seconds
| * | | | | | remove AR auto-explain (config.auto_explain_threshold_in_seconds)Yves Senn2013-02-2414-223/+39
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Use sprockets-rails 2.0.0.rc3 in new appsGuillermo Iguaran2013-02-242-2/+2
| | | | | |
* | | | | | Merge pull request #9399 from neerajdotname/7832-dependent-optionRafael Mendonça França2013-02-241-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated doc to clarify about update_all and delete_all
| * | | | | | Updated doc to clarify about update_all and delete_allNeeraj Singh2013-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Mention the extraction of Active Resource in the upgrading guideRafael Mendonça França2013-02-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Mention the removal of attr_accessible and attr_protected in the upgrading guideRafael Mendonça França2013-02-241-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Point to the Protected Attributes gem to those who want a smoothly upgrade path before to change to use Strong Parameters. [ci skip]
* | | | | | Skip connection url test when the machine is using socket configuration.Rafael Mendonça França2013-02-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The connection url parssing don't accept the socket option
* | | | | | Do not type cast all the database url values.Rafael Mendonça França2013-02-248-56/+32
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | We should only type cast when we need to use. Related to 4b005fb371c2e7af80df7da63be94509b1db038c
* | | | | Merge pull request #9398 from senny/revert_precompile_config_moveGuillermo Iguaran2013-02-243-10/+6
|\ \ \ \ \ | | | | | | | | | | | | Revert "move config.assets.precompile into config/application.rb"
| * | | | | Revert "move config.assets.precompile into config/application.rb"Yves Senn2013-02-243-10/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 304f4d4c25ccabdbf97d37dd7a92a54d0b63a9c9. As it turns out everything should behave as it did and we don't need to move this configuration option.
* | | | | fix respond_to without blocks not working if one of the blocks is allgrosser2013-02-244-1/+25
| | | | |
* | | | | Merge pull request #9356 from senny/988_multiple_actions_for_after_commitSteve Klabnik2013-02-243-14/+60
|\ \ \ \ \ | | | | | | | | | | | | multiple actions for :on option with `after_commit` and `after_rollback`
| * | | | | multiple actions for :on option with `after_commit` and `after_rollback`Yves Senn2013-02-213-14/+60
| | | | | | | | | | | | | | | | | | | | | | | | Closes #988.
* | | | | | Merge pull request #9397 from senny/9201_duplicate_associations_with_natural_keyRafael Mendonça França2013-02-242-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | test case to prevent duplicated associations with custom PK.
| * | | | | | test case to prevent duplicated associations with custom PK.Yves Senn2013-02-242-0/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | closes #9201
* | | | | | Merge pull request #9395 from yahonda/oracle_index_lengthCarlos Antonio da Silva2013-02-231-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Address failure test_rename_column_with_multi_column_index with Oracle
| * | | | | | Oracle enhanced adapter shortens its name if it is longer than 30 bytesYasuo Honda2013-02-241-2/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | because of Oracle database index length spec.
* | | | | | Merge pull request #9394 from senny/actually_rename_the_test_caseRafael Mendonça França2013-02-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | also rename the test-case class inside columns_test.rb
| * | | | | | also rename the test-case class inside columns_test.rbYves Senn2013-02-241-1/+1
|/ / / / / /
* | | | | | Revert "prevent minitest from printing a --seed run option"Xavier Noria2013-02-241-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 c15862ae0cb876d745609170f0f90a9bb9b5e0ae.
* | | | | | prevent minitest from printing a --seed run optionXavier Noria2013-02-241-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | See the first FIXME comment in the patch for the rationale.
* | | | | | registers the encrypted session store in the AP changelogXavier Noria2013-02-231-0/+4
| | | | | |
* | | | | | Merge pull request #9393 from rubys/masterGuillermo Iguaran2013-02-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | guides/rails_guides moved up and out of the railties directory
| * | | | | | guides/rails_guides moved up and out of the railties directorySam Ruby2013-02-231-1/+1
| | | | | | |
* | | | | | | adds a missing LIMIT 1 in #take docsXavier Noria2013-02-231-1/+1
|/ / / / / /
* | | | | | Merge pull request #9389 from senny/forwardport_9388Carlos Antonio da Silva2013-02-231-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Forwardport #9388 rename/remove column preserves custom PK.
| * | | | | | rename_column_test.rb -> columns_test.rb to reveal intent.Yves Senn2013-02-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | forwardport #9388 rename/remove column preserves custom PK.Yves Senn2013-02-231-1/+15
|/ / / / / /
* | | | | | Merge pull request #9387 from boukevanderbijl/masterCarlos Antonio da Silva2013-02-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix debug helper not inspecting when it can't convert to YAML
| * | | | | | Fix debug helper not inspecting on ExceptionBouke van der Bijl2013-02-231-1/+1
|/ / / / / / | | | | | | | | | | | | The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534.
* | | | | | Move number_to_human test from AP to ASCarlos Antonio da Silva2013-02-222-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well.
* | | | | | Changelog improvements, use 1.9 style hash in examples [ci skip]Carlos Antonio da Silva2013-02-222-14/+13
| | | | | |
* | | | | | Merge pull request #9347 from hoffm/number_to_human_bugSteve Klabnik2013-02-223-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Address edge case for number_to_human with units option.
| * | | | | | Address edge case for number_to_human with units option.hoffm2013-02-223-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #9384 from eval/documentation_of_minuteCarlos Antonio da Silva2013-02-222-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Correct comment for (beginning|end)_of_minute [ci skip]
| * | | | | | | Correct comment for (beginning|end)_of_minuteGert Goet2013-02-222-4/+4
|/ / / / / / /
* / / / / / / Fix backwards compatibility with Rails 3 apps.Steve Klabnik2013-02-223-40/+52
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 18:12:49 +0000