aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Check that Rack::Sendfile is not included unless ↵Santiago Pastorino2011-07-261-0/+8
| | | | config.action_dispatch.x_sendfile_header is set
* Merge pull request #2262 from sferik/format_trueJosé Valim2011-07-251-0/+6
|\ | | | | Allow a route to have :format => true
| * Add documentation for :format => trueErik Michaels-Ober2011-07-251-0/+6
| |
* | Don't use Rack::Sendfile middleware if x_sendfile_header is not presentSantiago Pastorino2011-07-251-1/+3
| |
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-257-278/+728
|\ \ | |/ |/|
| * let TIP and friends handle a multiline paragraphXavier Noria2011-07-252-18/+19
| | | | | | | | | | | | Normally I would have done this in master, but there was already a guide with wrapped content, so worked here. I am going to cross-merge now.
| * Revert "Add in a tip about opening two command prompt windows"Vijay Dev2011-07-251-5/+0
| | | | | | | | | | | | | | This reverts commit 1e5fa59d132562399536a3ca06295b60558bc258. Reason: It's somewhat a grey area. We don't really want to tell the users how they want to use the terminal.
| * Revert "Update the TIP formatter to handle multiline tips"Vijay Dev2011-07-252-39/+1
| | | | | | | | | | | | This reverts commit e3dbe66e196069fde7d3ff118bd25a03184915fa. Reason: Code changes are not allowed in docrails.
| * Improve ch. 1 of the Form Helpers guideElliot Winkler2011-07-241-46/+28
| |
| * Add in a tip about opening two command prompt windowsJason Noble & Ralph Shnelvar2011-07-241-0/+5
| |
| * Fix two spaces after end of sentence.Jason Noble & Ralph Shnelvar2011-07-241-2/+2
| |
| * Extend description of rails generate scaffold and what it's options accomplishJason Noble & Ralph Shnelvar2011-07-241-0/+4
| |
| * Merge branch 'master' of github.com:lifo/docrailsMichael Lavrisha2011-07-243-39/+97
| |\
| | * Updated migrations.textile to clarify Using Models in Your MigrationsMike Howard2011-07-241-18/+85
| | | | | | | | | | | | | | | Rewrote entire section including example code, error message, and work around.
| | * Make the rails not found tip more explanatory.Jason Noble & Ralph Shnelvar2011-07-241-2/+2
| | |
| | * Updated rails_welcome.png to latest Rails welcome page.Jason Noble & Ralph Shnelvar2011-07-241-0/+0
| | |
| | * Update wording of TIP about --database option for rails newJason Noble & Ralph Shnelvar2011-07-241-6/+6
| | |
| | * Remove "bundle install" section, as rails new ______ runs bundle install for youJason Noble & Ralph Shnelvar2011-07-241-12/+0
| | |
| | * Fix TIP formatting issueJason Noble & Ralph Shnelvar2011-07-241-1/+2
| | |
| | * Add a note about the fact that the Windows prompt will look different than ↵Jason Noble & Ralph Shnelvar2011-07-241-0/+2
| | | | | | | | | | | | the linux/osx prompt
| * | Simpler brief explanation of Rails and RESTMichael Lavrisha2011-07-241-3/+2
| | |
| * | Update the TIP formatter to handle multiline tipsMichael Lavrisha2011-07-242-1/+39
| | | | | | | | | | | | - includes 3 tests
| * | Merge branch 'master' of github.com:lifo/docrailsMichael Lavrisha2011-07-241-214/+573
| |\| | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile
| | * Reformatted to 80 chars.Jason Noble & Ralph Shnelvar2011-07-241-216/+573
| | |
| * | Merge branch 'master' of github.com:lifo/docrailsMichael Lavrisha2011-07-241-29/+76
| |\| | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile
| | * Wrapped text content to 120 charsJason Noble & Ralph Shnelvar2011-07-241-30/+79
| | |
| * | Rewrite apart of the REST section to be in the present tenseMichael Lavrisha2011-07-241-2/+2
| |/
| * Provide consistant indentation for the example codeMichael Lavrisha2011-07-241-8/+8
| |
* | Merge pull request #2258 from thedarkone/no-file-statJosé Valim2011-07-251-1/+1
|\ \ | | | | | | Use shorter class-level File methods instead of going through File.stat
| * | Use shorter class-level File methods instead of going through File.stat.thedarkone2011-07-251-1/+1
| |/
* | provide more explicit test namesDamien Mathieu2011-07-251-2/+2
| |
* | Merge pull request #2247 from dmathieu/test_precompile_cachingJosé Valim2011-07-251-1/+11
|\ \ | | | | | | Add test checking that precompiling assets performs caching
| * | add test checking that precompiling assets performs cachingDamien Mathieu2011-07-251-1/+11
| |/
* / Make polymorphic_url calls go through application helpers again.thedarkone2011-07-251-0/+19
|/ | | | This brings back the ability to overwrite/extend url generating methods in application heleprs.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-2414-37/+45
|\
| * little details seen while reviewingXavier Noria2011-07-241-2/+2
| |
| * Moved ActionController, ActionView and ActionDispatch sections under ActionPackJason Noble & Ralph Shnelvar2011-07-241-3/+3
| |
| * Add link to the Layouts and Rendering guide to explain more on view templatesJason Noble & Ralph Shnelvar2011-07-241-1/+3
| |
| * Modified the content based on vijaydev's commentJason Noble & Ralph Shnelvar2011-07-241-1/+1
| | | | | | https://github.com/lifo/docrails/commit/3eb99aab77c04dbd95dfc9f73e03a667f114914f#commitcomment-493737
| * Update guide to be based on Rails 3.1.Jason Noble & Ralph Shnelvar2011-07-241-1/+1
| |
| * Added link to the RubyGems User's GuideJason Noble & Ralph Shnelvar2011-07-241-0/+1
| |
| * Added explanation to Components of Rails to help users not get hung up on ↵Jason Noble & Ralph Shnelvar2011-07-241-1/+2
| | | | | | | | details
| * Merge branch 'master' of https://github.com/lifo/docrailsKen Ip2011-07-241-5/+5
| |\
| | * Added some context for rack apps, linked to the Rails on Rack guide.Jason Noble & Ralph Shnelvar2011-07-241-1/+1
| | |
| | * Clarified notes in 3.2 Creating the Blog ApplicationMike Howard2011-07-241-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/modelMike Howard2011-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | relationship. changed wording 'one table ... corresponds to one model' to 'each table ...'
| * | Update "Getting Started" for Rails 3.1Ken Ip2011-07-241-2/+6
| |/ | | | | | | Add additional files generated by rails 3.1 generator.
| * Revert "Tests now require MySQL2 adapter in order to run"Xavier Noria2011-07-241-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.
| * Changed a few instances of of words in the API docs written in British ↵Oemuer Oezkir2011-07-242-6/+6
| | | | | | | | | | | | English to American English(according to Weber)
| * Changing Textile emphasis underscores to em tags; the link with underscores ↵Carol Nichols2011-07-231-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.