aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improve `rake stats` for JavaScript and CoffeeScript.Hendy Tanata2013-02-254-46/+394
* Merge pull request #8815 from bogdan/simplified-to-json-argsSteve Klabnik2013-02-241-15/+8
|\
| * Simplify code in AS json encoderBogdan Gusiev2013-01-061-15/+8
* | Improve AR changelog [ci skip]Carlos Antonio da Silva2013-02-241-2/+2
* | Add more information to the CHANGELOG entry [ci skip]Rafael Mendonça França2013-02-241-0/+12
* | 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.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
|/ /
* | 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.Yves Senn2013-02-243-2/+13
* | | 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.Yves Senn2013-02-241-9/+7
| |/ /
* | | 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` commandPrem Sichanugrist2013-02-2412-183/+7
* | | Merge pull request #9400 from senny/remove_auto_explain_threshold_in_secondsXavier Noria2013-02-2414-223/+39
|\ \ \
| * | | remove AR auto-explain (config.auto_explain_threshold_in_seconds)Yves Senn2013-02-2414-223/+39
| |/ /
* | | 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_allNeeraj Singh2013-02-241-2/+2
* | | | Mention the extraction of Active Resource in the upgrading guideRafael Mendonça França2013-02-241-0/+4
* | | | Mention the removal of attr_accessible and attr_protected in the upgrading guideRafael Mendonça França2013-02-241-0/+2
|/ / /
* | | Skip connection url test when the machine is using socket configuration.Rafael Mendonça França2013-02-241-0/+3
* | | Do not type cast all the database url values.Rafael Mendonça França2013-02-248-56/+32
|/ /
* | Merge pull request #9398 from senny/revert_precompile_config_moveGuillermo Iguaran2013-02-243-10/+6
|\ \
| * | Revert "move config.assets.precompile into config/application.rb"Yves Senn2013-02-243-10/+6
|/ /
* | 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`Yves Senn2013-02-213-14/+60
* | | 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.Yves Senn2013-02-242-0/+12
|/ / /
* | | Merge pull request #9395 from yahonda/oracle_index_lengthCarlos Antonio da Silva2013-02-231-2/+10
|\ \ \
| * | | Oracle enhanced adapter shortens its name if it is longer than 30 bytesYasuo Honda2013-02-241-2/+10
|/ / /
* | | 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.rbYves Senn2013-02-241-1/+1
|/ / /
* | | Revert "prevent minitest from printing a --seed run option"Xavier Noria2013-02-241-12/+2
* | | prevent minitest from printing a --seed run optionXavier Noria2013-02-241-2/+12
* | | 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 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
|\ \ \
| * | | rename_column_test.rb -> columns_test.rb to reveal intent.Yves Senn2013-02-231-0/+0
| * | | 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 on ExceptionBouke van der Bijl2013-02-231-1/+1
|/ / /
* | | Move number_to_human test from AP to ASCarlos Antonio da Silva2013-02-222-5/+7
* | | Changelog improvements, use 1.9 style hash in examples [ci skip]Carlos Antonio da Silva2013-02-222-14/+13