aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Eliminate dependency on Rails::VERSION::STRINGAndrew White2012-06-053-21/+44
| | | | | | To facilitate the use of ActiveSupport::Testing::Performance outside of a Rails application conditionally check for the presence of Rails::VERSION::STRING before including it in the environment string.
* 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.
| * bundle exec rake assets:precompile shouldn't fail quietly.John Yani2012-06-051-17/+24
| | | | | | | | | | | | | | | | | | If JavaScript runtime is not installed, execjs fails with error quietly, while tests continue to run. This should not happen since it causes tests to fail for unknown reason (#6621). This commit assures that if JavaScript runtime is not installed, an assertion is raised.
* | Merge pull request #6638 from frodsan/config_accessorRafael Mendonça França2012-06-053-9/+82
|\ \ | | | | | | add instance_accessor option to config_accessor
| * | add instance_accessor option to ActiveSupport::Configurable#config_accessorFrancesco Rodriguez2012-06-053-9/+82
|/ / | | | | | | | | | | | | | | | | | | Changes: * Add `instance_accessor` option to opt out of the instance writer and instance reader methods. * Raises a NameError if the name of the attribute is not valid. * Update documentation and tests. * Add CHANGELOG entry in activesupport.
* | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-06-051-0/+3
|\ \ | | | | | | Resolver tests fail if mysql adapter not installed
| * | The resolver tests fail if the mysql gem is not installed; this breaksDavid Paschich2012-06-031-0/+3
| |/ | | | | | | | | | | | | | | being able to run the sqlite3 tests without that gem. This fix ensures the tests will only run if the mysql gem is installed. A better solution might be to move these tests into the per-adapter tests, and test each adapter's resolver.
* | Merge pull request #6632 from route/one_line_code_for_loggerJosé Valim2012-06-051-5/+1
|\ \ | | | | | | One-liner code for logger in ActionView::Helpers::ControllerHelper
| * | 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 FormHelper#button
| * | 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' command
| * | | 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 delegate
| * | 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 Rails 3.2.5 Regression: incorrect _changed? for datetimes
| * 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.
| * 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 associations
| * 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
| | | | | | just a consolidation of the changelogs with minimal formatting [ci skip]
* 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
| | | | | | From the Pull Request #6461
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 911a0859ac065aa8e8834ac985353d659c7c7b65 and 30b31f51af6f7094c4a27b086755fc66c368d6fa. Reason: these changes make the Active Model tests fail randomly. Some examples: http://travis-ci.org/#!/rails/rails/jobs/1498992 http://travis-ci.org/#!/rails/rails/jobs/1496948 http://travis-ci.org/#!/rails/rails/jobs/1489985 This script was used to reproduce these breaks: https://gist.github.com/f6828a03ee4d40bffbc3 200 times, 0 failures
* | Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
| | | | | | | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase
* | minor comment revisionXavier Noria2012-06-011-1/+1
| |
* | Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
| | | | | | | | Correct the use of to_model in polymorphic routing
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573)
* | Merge pull request #6586 from amatsuda/generator_blank_lineRafael Mendonça França2012-06-012-2/+2
|\ \ | | | | | | remove unneeded blank line from !namespeced? generated controllers
| * | 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."
| * | Revert "Only include Rake::DSL if it's defined."Akira Matsuda2012-06-011-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7. Reason: Ruby 1.9.3 is shipped with Rake > 0.9
* | | Merge pull request #6584 from amatsuda/ar_explain_inspect_readabilityXavier Noria2012-06-011-1/+7
|\ \ \ | | | | | | | | improve readability of AR explain result
| * | | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
|/ / /
* | | Merge pull request #6579 from amatsuda/null_relation_modulizeJosé Valim2012-05-313-11/+15
|\ \ \ | |/ / |/| | modulize AR::NullRelation
| * | unused method argumentsAkira Matsuda2012-06-011-7/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 12:57:53 +0000