aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6643 from fredwu/fix_require_dependencyJosé Valim2012-06-063-6/+9
|\
| * Fixed the application_controller require_dependency path generated by the app...Fred Wu2012-06-063-6/+9
|/
* Eliminate dependency on Rails::VERSION::STRINGAndrew White2012-06-053-21/+44
* Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assertJosé Valim2012-06-051-17/+24
|\
| * bundle exec rake assets:precompile shouldn't fail quietly.John Yani2012-06-051-17/+24
* | Merge pull request #6638 from frodsan/config_accessorRafael Mendonça França2012-06-053-9/+82
|\ \
| * | add instance_accessor option to ActiveSupport::Configurable#config_accessorFrancesco Rodriguez2012-06-053-9/+82
|/ /
* | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-06-051-0/+3
|\ \
| * | The resolver tests fail if the mysql gem is not installed; this breaksDavid Paschich2012-06-031-0/+3
| |/
* | Merge pull request #6632 from route/one_line_code_for_loggerJosé Valim2012-06-051-5/+1
|\ \
| * | One-liner code for logger in ActionView::Helpers::ControllerHelperDmitry Vorotilin2012-06-051-5/+1
|/ /
* | Merge pull request #6631 from yuki24/use_block_in_button_helperJosé Valim2012-06-052-3/+18
|\ \
| * | accept a block in button helper.Yuki Nishijima2012-06-052-3/+18
* | | Merge pull request #6628 from fredwu/fix_skip_gemspecJosé Valim2012-06-052-0/+41
|\ \ \
| * | | Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' commandFred Wu2012-06-052-0/+41
| |/ /
* | | Merge pull request #6630 from route/logger_in_metalJosé Valim2012-06-051-2/+8
|\ \ \ | |/ / |/| |
| * | Metal controller doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-051-2/+8
| |/
* | Merge pull request #6619 from kennyj/fix_6591Piotr Sarnacki2012-06-042-1/+13
|\ \ | |/ |/|
| * Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
| * Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
|/
* Merge pull request #6607 from parndt/patch-2Vijay Dev2012-06-031-2/+2
|\
| * Updated guide to say Rails 4.0 requires 1.9.3 or higher, not Rails 3.2.Philip Arndt2012-06-031-2/+2
* | Merge pull request #6605 from amatsuda/ar_merge_association_testJon Leighton2012-06-031-0/+8
|\ \ | |/ |/|
| * a test case that ensures AR::Relation#merge can merge associationsAkira Matsuda2012-06-031-0/+8
|/
* starting with the Rails 4.0 release notesVijay Dev2012-06-021-0/+591
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-026-36/+59
|\
| * copy edit AS guide [ci skip]Vijay Dev2012-06-021-7/+5
| * copy edit routing guide [ci skip]Vijay Dev2012-06-021-1/+3
| * fix up the example app for getting started guide [ci skip]Vijay Dev2012-06-026-10/+8
| * better explanations for acts_like?, try and deep_dupHrvoje Šimić2012-06-021-6/+20
| * change welcome_helper.rb to home_helper.rbspyhole2012-06-011-0/+0
| * Update guides/code/getting_started/test/functional/home_controller_test.rbspyhole2012-06-021-1/+1
| * the file name should be changed to home_helper.rbspyhole2012-06-021-1/+1
| * Update guides/code/getting_started/app/controllers/home_controller.rbspyhole2012-06-021-1/+1
| * Update guides/code/getting_started/config/routes.rbspyhole2012-06-021-1/+1
| * routes are viewable in browser (update guides)schneems2012-06-011-2/+2
| * update ActiveModel::Dirty documentationFrancesco Rodriguez2012-05-311-24/+35
| * Fix typo [ci skip]Erich Menge2012-05-301-1/+1
* | Revert some ActiveSupport::Callbacks changes.Rafael Mendonça França2012-06-011-3/+16
* | Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
* | minor comment revisionXavier Noria2012-06-011-1/+1
* | Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
* | Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-015-4/+91
* | Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-014-3/+27
* | Merge pull request #6586 from amatsuda/generator_blank_lineRafael Mendonça França2012-06-012-2/+2
|\ \
| * | remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
|/ /
* | Merge pull request #6583 from amatsuda/rake_dsl_19Piotr Sarnacki2012-06-011-1/+1
|\ \
| * | Revert "Only include Rake::DSL if it's defined."Akira Matsuda2012-06-011-1/+1
* | | Merge pull request #6584 from amatsuda/ar_explain_inspect_readabilityXavier Noria2012-06-011-1/+7
|\ \ \
| * | | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 04:14:38 +0000