| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | add instance_accessor option to ActiveSupport::Configurable#config_accessor | Francesco Rodriguez | 2012-06-05 | 3 | -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_sqlite3 | Carlos Antonio da Silva | 2012-06-05 | 1 | -0/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Resolver tests fail if mysql adapter not installed | |||||
| | * | | | | | The resolver tests fail if the mysql gem is not installed; this breaks | David Paschich | 2012-06-03 | 1 | -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_logger | José Valim | 2012-06-05 | 1 | -5/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | One-liner code for logger in ActionView::Helpers::ControllerHelper | |||||
| | * | | | | | One-liner code for logger in ActionView::Helpers::ControllerHelper | Dmitry Vorotilin | 2012-06-05 | 1 | -5/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #6631 from yuki24/use_block_in_button_helper | José Valim | 2012-06-05 | 2 | -3/+18 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Accept a block in FormHelper#button | |||||
| | * | | | | | accept a block in button helper. | Yuki Nishijima | 2012-06-05 | 2 | -3/+18 | |
| | | |/ / / | |/| | | | ||||||
| * | | | | | Merge pull request #6628 from fredwu/fix_skip_gemspec | José Valim | 2012-06-05 | 2 | -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' command | Fred Wu | 2012-06-05 | 2 | -0/+41 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #6630 from route/logger_in_metal | José Valim | 2012-06-05 | 1 | -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 delegate | Dmitry Vorotilin | 2012-06-05 | 1 | -2/+8 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #6619 from kennyj/fix_6591 | Piotr Sarnacki | 2012-06-04 | 2 | -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!. | kennyj | 2012-06-04 | 1 | -1/+2 | |
| | | | | | ||||||
| | * | | | Add failing test for 3.2.5 datetime attribute regression | Evan Arnold | 2012-06-04 | 1 | -0/+11 | |
| |/ / / | ||||||
| * | | | Merge pull request #6607 from parndt/patch-2 | Vijay Dev | 2012-06-03 | 1 | -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 Arndt | 2012-06-03 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #6605 from amatsuda/ar_merge_association_test | Jon Leighton | 2012-06-03 | 1 | -0/+8 | |
| |\ \ \ \ | |/ / / |/| | | | a test case that ensures AR::Relation#merge can merge associations | |||||
| | * | | | a test case that ensures AR::Relation#merge can merge associations | Akira Matsuda | 2012-06-03 | 1 | -0/+8 | |
| |/ / / | ||||||
| * | | | starting with the Rails 4.0 release notes | Vijay Dev | 2012-06-02 | 1 | -0/+591 | |
| | | | | | | | | | | | | | | | | | | | just a consolidation of the changelogs with minimal formatting [ci skip] | |||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-06-02 | 6 | -36/+59 | |
| |\ \ \ | ||||||
| | * | | | copy edit AS guide [ci skip] | Vijay Dev | 2012-06-02 | 1 | -7/+5 | |
| | | | | | ||||||
| | * | | | copy edit routing guide [ci skip] | Vijay Dev | 2012-06-02 | 1 | -1/+3 | |
| | | | | | ||||||
| | * | | | fix up the example app for getting started guide [ci skip] | Vijay Dev | 2012-06-02 | 6 | -10/+8 | |
| | | | | | ||||||
| | * | | | better explanations for acts_like?, try and deep_dup | Hrvoje Šimić | 2012-06-02 | 1 | -6/+20 | |
| | | | | | ||||||
| | * | | | change welcome_helper.rb to home_helper.rb | spyhole | 2012-06-01 | 1 | -0/+0 | |
| | | | | | ||||||
| | * | | | Update guides/code/getting_started/test/functional/home_controller_test.rb | spyhole | 2012-06-02 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | the file name should be changed to home_helper.rb | spyhole | 2012-06-02 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Update guides/code/getting_started/app/controllers/home_controller.rb | spyhole | 2012-06-02 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Update guides/code/getting_started/config/routes.rb | spyhole | 2012-06-02 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | routes are viewable in browser (update guides) | schneems | 2012-06-01 | 1 | -2/+2 | |
| | | | | | | | | | | | | | From the Pull Request #6461 | |||||
| | * | | | update ActiveModel::Dirty documentation | Francesco Rodriguez | 2012-05-31 | 1 | -24/+35 | |
| | | | | | ||||||
| | * | | | Fix typo [ci skip] | Erich Menge | 2012-05-30 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Revert some ActiveSupport::Callbacks changes. | Rafael Mendonça França | 2012-06-01 | 1 | -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::TestCase | Piotr Sarnacki | 2012-06-01 | 4 | -1/+24 | |
| | | | | | | | | | | | | | | | | | | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase | |||||
| * | | | | minor comment revision | Xavier Noria | 2012-06-01 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #6588 from nbibler/polymorphic_to_model | José Valim | 2012-06-01 | 2 | -2/+34 | |
| | | | | | | | | | | | | | | | | | Correct the use of to_model in polymorphic routing | |||||
| * | | | | Sync CHANGLOG with the 3-2-stable branch | Rafael Mendonça França | 2012-06-01 | 5 | -4/+91 | |
| | | | | | ||||||
| * | | | | Include routes.mounted_helpers into integration tests | Piotr Sarnacki | 2012-06-01 | 4 | -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_line | Rafael Mendonça França | 2012-06-01 | 2 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | remove unneeded blank line from !namespeced? generated controllers | |||||
| | * | | | | remove unneeded blank line from !namespeced? controller generators | Akira Matsuda | 2012-06-01 | 2 | -2/+2 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #6583 from amatsuda/rake_dsl_19 | Piotr Sarnacki | 2012-06-01 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | Revert "Only include Rake::DSL if it's defined." | |||||
| | * | | | | Revert "Only include Rake::DSL if it's defined." | Akira Matsuda | 2012-06-01 | 1 | -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_readability | Xavier Noria | 2012-06-01 | 1 | -1/+7 | |
| |\ \ \ \ \ | | | | | | | | | | | | | improve readability of AR explain result | |||||
| | * | | | | | improve readability of AR explain result | Akira Matsuda | 2012-06-01 | 1 | -1/+7 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #6579 from amatsuda/null_relation_modulize | José Valim | 2012-05-31 | 3 | -11/+15 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | modulize AR::NullRelation | |||||
| | * | | | | unused method arguments | Akira Matsuda | 2012-06-01 | 1 | -7/+6 | |
| | | | | | | ||||||
| | * | | | | modulize AR::NullRelation | Akira Matsuda | 2012-06-01 | 3 | -4/+9 | |
| |/ / / / | | | | | | | | | | | | | now we can invoke previously added scope extension methods | |||||
| * | | | | Rake::DSL should always be available | Jeremy Kemper | 2012-05-31 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master-sec' | Aaron Patterson | 2012-05-31 | 5 | -4/+65 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this | |||||
| | * | | | | Strip [nil] from parameters hash. | Aaron Patterson | 2012-05-30 | 2 | -1/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660 | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |