Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7800 from bdurand/optimize_cache_entry_take_2 | Xavier Noria | 2012-09-30 | 4 | -101/+141 |
|\ | | | | | Optimize ActiveSupport::Cache::Entry to reduce overhead | ||||
| * | Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead. | Brian Durand | 2012-09-30 | 4 | -101/+141 |
|/ | |||||
* | Merge pull request #7795 from guilleiguaran/fix-ap-changelog | Vijay Dev | 2012-09-30 | 1 | -3/+2 |
|\ | | | | | Fix changelog entry about sprockets-rails | ||||
| * | Fix changelog entry about sprockets-rails | Guillermo Iguaran | 2012-09-30 | 1 | -3/+2 |
|/ | |||||
* | Merge pull request #7791 from acapilleri/build_association | Rafael Mendonça França | 2012-09-29 | 1 | -5/+3 |
|\ | | | | | small refactoring of build_relation in uniqueness | ||||
| * | small refactoring of build_relation in uniqueness | Angelo Capilleri | 2012-09-29 | 1 | -5/+3 |
| | | | | | | | | | | reflection init as 'if' stantment. column is always the same expression and depends from the changing of attributes | ||||
* | | Whitespaces :scissors: [ci skip] | Rafael Mendonça França | 2012-09-30 | 2 | -11/+14 |
| | | |||||
* | | Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased | Rafael Mendonça França | 2012-09-29 | 4 | -5/+51 |
|\ \ | |/ |/| | REBASED: fixing assert_template bug when template matches expected, but not ends with | ||||
| * | `assert_template` no more passing with what ever string that matches. | Hugo Roque | 2012-09-29 | 4 | -5/+51 |
|/ | | | | | | | | | | | | | | | | | | | | | | | Given Im rendering an template `/layout/hello.html.erb`, assert_template was passing with any string that matches. This behavior allowed false passing like: assert_template "layout" assert_template "out/hello" Now the passing possibilities are: assert_template "layout/hello" assert_template "hello" fixing assert_template bug when template matches expected, but not ends with Cherry Pick Merge: Fixes issue #3849 assert_template false positive taking redundant test off prevening incorrect assert_template when rendering with repeated names in path updating CHANGELOG with bugfix: assert_template false passing | ||||
* | Merge pull request #7784 from morgoth/proper_test_names_for_assertions | Rafael Mendonça França | 2012-09-28 | 1 | -2/+2 |
|\ | | | | | Changed test names to match proper context | ||||
| * | Changed test names to match proper context | Wojciech Wnętrzak | 2012-09-28 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #7787 from sferik/update_minitest | Jeremy Kemper | 2012-09-28 | 1 | -1/+1 |
|\ \ | | | | | | | Update minitest dependency to ~> 4.0 | ||||
| * | | Update minitest dependency to ~> 4.0 | Erik Michaels-Ober | 2012-09-28 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #7783 from guilleiguaran/namespace-assets-cache-store | Santiago Pastorino | 2012-09-28 | 3 | -3/+6 |
|\ \ | | | | | | | Assets cache shouldn't be shared between different environments | ||||
| * | | Assets cache shouldn't be shared between different environments | Guillermo Iguaran | 2012-09-28 | 3 | -3/+6 |
| | | | |||||
* | | | Merge pull request #7782 from yahonda/case_insensitive_test_for_partial_inserts | Rafael Mendonça França | 2012-09-28 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Change query pattern case insensitive | ||||
| * | | Change query pattern case insensitive | Yasuo Honda | 2012-09-29 | 1 | -1/+1 |
|/ / | | | | | | | because Oracle adapter uses upper case attribute/column name. | ||||
* / | Fix syntax error in the command_line guide [ci skip] | Rafael Mendonça França | 2012-09-28 | 1 | -2/+2 |
|/ | |||||
* | Fix syntax error with no US-ASCII char | Rafael Mendonça França | 2012-09-28 | 1 | -1/+1 |
| | |||||
* | revise commandline guide [ci skip] | Vijay Dev | 2012-09-28 | 1 | -12/+6 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-28 | 36 | -373/+365 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | ||||
| * | copy editing [ci skip] | Vijay Dev | 2012-09-28 | 1 | -1/+1 |
| | | |||||
| * | Revert "add documentation to generated routes" | Vijay Dev | 2012-09-28 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | This reverts commit bfafa999ddaa203224ac0222203517a0d2a3f6bf. Changes in templates aren't allowed in docrails. [ci skip] | ||||
| * | Improve documentation for subscribe block | Grant Hutchins & Sabrina Staedt | 2012-09-27 | 1 | -1/+11 |
| | | |||||
| * | Add #update_columns entry in Rails 4.0 release notes [ci skip] | Sebastian Martinez | 2012-09-27 | 1 | -0/+8 |
| | | |||||
| * | bleakhouse is no longer useful for rails and outdated. | Teng Siong Ong | 2012-09-27 | 1 | -55/+1 |
| | | |||||
| * | typo fix: remove duplicate period | cczona | 2012-09-27 | 1 | -1/+1 |
| | | |||||
| * | Remove readonly notice. | Steve Klabnik | 2012-09-26 | 1 | -2/+0 |
| | | | | | | | | | | | | | | You need to have @implicit_readonly set for this to happen, and it's false by defualt. Fixes #3386. | ||||
| * | update image_tag output in examples to actual | Nihad Abbasov | 2012-09-25 | 1 | -4/+4 |
| | | | | | | [ci-skip] | ||||
| * | Update guides/source/routing.md | Bryan Larsen | 2012-09-25 | 1 | -0/+12 |
| | | |||||
| * | add documentation to generated routes | schneems | 2012-09-24 | 2 | -2/+4 |
| | | | | | | Mention that in addition to `rake routes` a developer can also visit `/rails/info/routes` in the browser. | ||||
| * | remove misleading comment in Rakefile | schneems | 2012-09-24 | 1 | -3/+0 |
| | | | | | | Comment introduced in https://github.com/rails/rails/commit/bbb3e5a8 before rake `isolate:test` was even introduced https://github.com/rails/rails/commit/bbb3e5a8 | ||||
| * | Fix typo in 4_0_release_notes.md | Igor Zubkov | 2012-09-25 | 1 | -1/+1 |
| | | |||||
| * | remove duplication | Juanjo Bazán | 2012-09-24 | 1 | -1/+0 |
| | | |||||
| * | add a note about DynamicForm in error_messages_for section [ci skip] | Francesco Rodriguez | 2012-09-24 | 1 | -1/+5 |
| | | |||||
| * | String.to_time documentation along examples. | Adam Stankiewicz | 2012-09-24 | 1 | -1/+11 |
| | | |||||
| * | Removed duplicate line describing "default_options". | Cory Logan | 2012-09-23 | 1 | -1/+0 |
| | | | | | | | | [ci skip] | ||||
| * | update AC::ConditionalGet documentation [ci skip] | Francesco Rodriguez | 2012-09-22 | 1 | -27/+31 |
| | | |||||
| * | update AC::Caching documentation [ci skip] | Francesco Rodriguez | 2012-09-22 | 5 | -87/+103 |
| | | |||||
| * | remove added indentation from the last commit [ci skip] | Francesco Rodriguez | 2012-09-22 | 1 | -1/+1 |
| | | |||||
| * | update AR::Validations documentation [ci skip] | Francesco Rodriguez | 2012-09-22 | 5 | -28/+28 |
| | | |||||
| * | nodoc AR::Railtie [ci skip] | Francesco Rodriguez | 2012-09-21 | 2 | -4/+4 |
| | | |||||
| * | remove AC::Parameters reference [ci skip] | Francesco Rodriguez | 2012-09-21 | 1 | -1/+1 |
| | | |||||
| * | update AR::Scoping documentation [ci skip] | Francesco Rodriguez | 2012-09-21 | 2 | -91/+77 |
| | | |||||
| * | add :nodoc: directive to AR::Fixtures::File [ci skip] | Francesco Rodriguez | 2012-09-21 | 1 | -1/+1 |
| | | |||||
| * | fix AR::Coders::YAMLColumn nodoc [ci skip] | Francesco Rodriguez | 2012-09-21 | 1 | -4/+2 |
| | | |||||
| * | update AR/attribute_methods documentation [ci skip] | Francesco Rodriguez | 2012-09-21 | 4 | -26/+36 |
| | | |||||
| * | Better docs for overriding inheretance column | Steve Klabnik | 2012-09-22 | 1 | -5/+2 |
| | | |||||
| * | fix AR::AttributeMethods::Dirty :nodoc: [ci skip] | Francesco Rodriguez | 2012-09-21 | 1 | -4/+4 |
| | | |||||
| * | fix AR::Associations::CollectionProxy#delete broken documentation [ci skip] | Francesco Rodriguez | 2012-09-21 | 1 | -23/+2 |
| | |