| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #2245 from ↵ | Santiago Pastorino | 2011-07-25 | 2 | -6/+25 |
| |\ | | | | | | | | | davidtrogers/constraints_block_passed_to_following_routes_in_same_scope Memoizing @blocks & disposing of constraints options properly | ||||
| | * | Ensure the constraints block is only applied to the correct route | Dave Rogers | 2011-07-25 | 2 | -6/+25 |
| | | | | | | | | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints. | ||||
| * | | Simplify the way default DATABASE_URL works. | Glenn Gillen | 2011-07-25 | 1 | -1/+1 |
| | | | |||||
| * | | no need for an anonymous class on every setup call | Aaron Patterson | 2011-07-25 | 1 | -10/+9 |
| | | | |||||
| * | | Merge pull request #2258 from thedarkone/no-file-stat | José Valim | 2011-07-25 | 4 | -5/+5 |
| |\ \ | | | | | | | Use shorter class-level File methods instead of going through File.stat | ||||
| | * | | Use shorter class-level File methods instead of going through File.stat. | thedarkone | 2011-07-25 | 4 | -5/+5 |
| | |/ | |||||
| * | | Merge pull request #2236 from cldwalker/after_initialize | Santiago Pastorino | 2011-07-25 | 3 | -2/+19 |
| |\ \ | | | | | | | Fix after_initialize and Base.create edge case | ||||
| | * | | use existing model for testing Base.create with #after_initialize | Gabriel Horner | 2011-07-24 | 4 | -23/+12 |
| | | | | |||||
| | * | | simplify and be more explicit about create and after_initialize tests | Gabriel Horner | 2011-07-24 | 2 | -24/+12 |
| | | | | |||||
| | * | | fix after_initialize edge case (close #2074 and close #2175) | Les Fletcher | 2011-07-24 | 4 | -2/+42 |
| | | | | | | | | | | | | | fix behavior when after_initialize is defined and a block is passed to Base.create | ||||
| * | | | Merge pull request #2254 from dmathieu/test_name | José Valim | 2011-07-25 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | provide more explicit test names | ||||
| | * | | | provide more explicit test names | Damien Mathieu | 2011-07-25 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #2247 from dmathieu/test_precompile_caching | José Valim | 2011-07-25 | 1 | -1/+11 |
| |\ \ \ | | | | | | | | | Add test checking that precompiling assets performs caching | ||||
| | * | | | add test checking that precompiling assets performs caching | Damien Mathieu | 2011-07-25 | 1 | -1/+11 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #2251 from thedarkone/update-all-order | José Valim | 2011-07-25 | 2 | -9/+25 |
| |\ \ \ | | | | | | | | | Bring back the ability to provide :order for update_all | ||||
| | * | | | Bring back the ability to provide :order for update_all. | thedarkone | 2011-07-25 | 2 | -9/+25 |
| | |/ / | |||||
| * | | | Merge pull request #2252 from thedarkone/polymorphic-url-helpers | José Valim | 2011-07-25 | 4 | -9/+33 |
| |\ \ \ | |/ / |/| | | Make polymorphic_url calls go through application helpers again. | ||||
| | * | | Make polymorphic_url calls go through application helpers again. | thedarkone | 2011-07-25 | 4 | -9/+33 |
| |/ / | | | | | | | This brings back the ability to overwrite/extend url generating methods in application heleprs. | ||||
| * | | Merge pull request #2238 from cesario/order-with-extra-spaces | Aaron Patterson | 2011-07-24 | 2 | -0/+5 |
| |\ \ | | | | | | | Ordering with extra spaces was raising a SQL exception | ||||
| | * | | Ordering with extra spaces was raising a SQL exception | Franck Verrot | 2011-07-24 | 2 | -0/+5 |
| | |/ | |||||
| * | | Merge pull request #2243 from dmathieu/comment | Xavier Noria | 2011-07-24 | 1 | -0/+1 |
| |\ \ | | | | | | | Help the next guy with explanations - See bb3b3e306 | ||||
| | * | | help the next guy with explanations - See bb3b3e306 | Damien Mathieu | 2011-07-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Use top level Rails constant | Andrew White | 2011-07-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-24 | 28 | -58/+66 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | little details seen while reviewing | Xavier Noria | 2011-07-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Moved ActionController, ActionView and ActionDispatch sections under ActionPack | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -3/+3 |
| | | | | |||||
| | * | | Add link to the Layouts and Rendering guide to explain more on view templates | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -1/+3 |
| | | | | |||||
| | * | | Modified the content based on vijaydev's comment | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -1/+1 |
| | | | | | | | | | | https://github.com/lifo/docrails/commit/3eb99aab77c04dbd95dfc9f73e03a667f114914f#commitcomment-493737 | ||||
| | * | | Update guide to be based on Rails 3.1. | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added link to the RubyGems User's Guide | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -0/+1 |
| | | | | |||||
| | * | | Added explanation to Components of Rails to help users not get hung up on ↵ | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | details | ||||
| | * | | Merge branch 'master' of https://github.com/lifo/docrails | Ken Ip | 2011-07-24 | 1 | -5/+5 |
| | |\ \ | |||||
| | | * | | Added some context for rack apps, linked to the Rails on Rack guide. | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Clarified notes in 3.2 Creating the Blog Application | Mike Howard | 2011-07-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed descriptino of Gemfile to add reference to Bundler Changed description of README to add 'You should edit ...' Changed description of Rakefile to reflect dynamic nature of Rakefile and point to app/lib/tasks/ as the place to add app-specific rake tasks. | ||||
| | | * | | Changed wording of paragraph 2.1.1 Models to clarify table/model | Mike Howard | 2011-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relationship. changed wording 'one table ... corresponds to one model' to 'each table ...' | ||||
| | * | | | Update "Getting Started" for Rails 3.1 | Ken Ip | 2011-07-24 | 1 | -2/+6 |
| | |/ / | | | | | | | | | | Add additional files generated by rails 3.1 generator. | ||||
| | * | | Revert "Tests now require MySQL2 adapter in order to run" | Xavier Noria | 2011-07-24 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: Setting up MySQL and Postgres needs installing servers and libraries that perhaps you don't need in your machine. We think fixing a bug in Active Support without running the suite of Active Record for all possible drivers is OK. That's why we explain first --without db, and after that we cover AR specifically. mysql2 is no different than mysql or pg in that sense. This reverts commit 50d5e0f7e8ab01f3e7b5cf806eb4f9348eeff363. | ||||
| | * | | Missed a few instances of British English spelling in the last commit | Oemuer Oezkir | 2011-07-24 | 3 | -3/+3 |
| | | | | | | | | | | | | | oh and obviously I meant according to Webster, not Weber | ||||
| | * | | Changed a few instances of of words in the API docs written in British ↵ | Oemuer Oezkir | 2011-07-24 | 15 | -26/+26 |
| | | | | | | | | | | | | | | | | | | | English to American English(according to Weber) | ||||
| | * | | Changing Textile emphasis underscores to em tags; the link with underscores ↵ | Carol Nichols | 2011-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | that follows is causing the emphasis underscores to be parsed incorrectly. This appears to be a bug with RedCloth; parsing with official Textile creates the HTML that I expect. I have filed ticket # 226 on RedCloth's lighthouse project and I will attempt to fix the problem with RedCloth. This commit is a workaround for the RedCloth bug that will give this guide the right formatting. | ||||
| | * | | Changed several instances of British English to be American English | Evan Farrar | 2011-07-23 | 8 | -10/+10 |
| | | | | |||||
| | * | | Replaced ‘ with ' in the guides. | Evan Farrar | 2011-07-23 | 2 | -7/+7 |
| | | | | |||||
| | * | | Tests now require MySQL2 adapter in order to run | Joe Fiorini | 2011-07-23 | 1 | -11/+2 |
| | | | | |||||
| | * | | now the documentation reflects the actual returned value for a missing ↵ | gnagno | 2011-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | translation | ||||
| * | | | Merge pull request #1186 from mitijain123/duplicable_test | Santiago Pastorino | 2011-07-24 | 1 | -7/+12 |
| |\ \ \ | | | | | | | | | Duplicable test is looking fine now. | ||||
| | * | | | Duplicable test is looking fine now. | Mitesh Jain | 2011-07-24 | 1 | -7/+12 |
| |/ / / | |||||
| * | | | Merge pull request #2239 from castlerock/scaffold_jquery | Santiago Pastorino | 2011-07-24 | 1 | -0/+1 |
| |\ \ \ | |_|/ |/| | | fixing broken test as jquery-rails is included in application.js | ||||
| | * | | Bringing back the jquery-rails. One test is dependent. | Mitesh Jain | 2011-07-24 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #2233 from gramos/fix-issue-1951-master | Aaron Patterson | 2011-07-23 | 2 | -2/+30 |
| |\ \ | | | | | | | Fix issue 1951 master Namespaced model partial_path is wrong in namespaced controllers | ||||
| | * | | - added ActionView::PartialRenderer#merge_path_into_partial(path, partial) | Gaston Ramos | 2011-07-24 | 2 | -3/+17 |
| | | | | | | | | | | | | | fix issues/1951 | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |