| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Merge pull request #7813 from arunagw/warning_fixed_as | Rafael Mendonça França | 2012-10-01 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | warning fixed: (...) interpreted as grouped expression | |||||
| | * | | | | | warning fixed: (...) interpreted as grouped expression | Arun Agrawal | 2012-10-01 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #7812 from bdurand/optimize_cache_entry_take_2 | Jeremy Kemper | 2012-09-30 | 2 | -3/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | fix broken cache tests | |||||
| | * | | | | | fix broken cache tests | Brian Durand | 2012-09-30 | 2 | -3/+3 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #7811 from iHiD/resource_generator_routes_master | Santiago Pastorino | 2012-09-30 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix the build (Broken scaffold routes test) | |||||
| | * | | | | | Fix broken scaffold routes test | Jeremy Walker | 2012-10-01 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #7810 from steveklabnik/fix_build | Jeremy Kemper | 2012-09-30 | 1 | -0/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | fix cache store test | |||||
| | * | | | | | fix cache store test | Steve Klabnik | 2012-09-30 | 1 | -0/+1 | |
| |/ / / / / | | | | | | | | | | | | | | | | Pull #7800 broke the build, this should fix it. | |||||
| * | | | | | Merge pull request #6450 from iHiD/resource_generator_routes_master | Rafael Mendonça França | 2012-09-30 | 2 | -6/+115 | |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Master branch: Fixed generated whitespace in routes when using namespaced resource. | |||||
| | * | | | | Fixed generated whitespace in routes when using namespaced resource. | Jeremy Walker | 2012-09-29 | 2 | -6/+115 | |
| | | | | | | ||||||
| * | | | | | Add a changelog entry for asset aliasing update in sprockets-rails. Supports ↵ | Jeremy Kemper | 2012-09-30 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | referencing foo.js as foo/index.js and vice versa. | |||||
| * | | | | | Merge pull request #7808 from steveklabnik/fix_assertion_order | Xavier Noria | 2012-09-30 | 1 | -5/+5 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix other assertions that were backwards. | |||||
| | * | | | | | Fix other assertions that were backwards. | Steve Klabnik | 2012-09-30 | 1 | -5/+5 | |
| |/ / / / / | | | | | | | | | | | | | | | | This time I used ack. | |||||
| * | | | | | Merge pull request #7805 from steveklabnik/fix_assertion_order | Xavier Noria | 2012-09-30 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | fix order of assertions. | |||||
| | * | | | | | fix order of assertions. | Steve Klabnik | 2012-09-30 | 1 | -2/+2 | |
| |/ / / / / | ||||||
| * | | | | | 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 | |
| | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |