Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-11 | 3 | -9/+9 | |
|\ | ||||||
| * | Fix typo in "must-revalidate" header name | Emin Hasanov | 2011-09-11 | 1 | -1/+1 | |
| | | ||||||
| * | Fix for :instance_reader => false code example | Andy Lindeman | 2011-09-10 | 1 | -1/+1 | |
| | | ||||||
| * | Update to conform to rails 3.1 generated caode | Michael P Laing | 2011-09-10 | 1 | -2/+2 | |
| | | ||||||
| * | some copy-edits | Vijay Dev | 2011-09-08 | 2 | -5/+5 | |
| | | ||||||
* | | clarify that documentation bugs have to be reported as Rails issues. [Closes ↵ | Xavier Noria | 2011-09-10 | 1 | -0/+4 | |
| | | | | | | | | #2858] | |||||
* | | Merge pull request #2757 from andmej/first_or_create_pull_request | Jon Leighton | 2011-09-08 | 1 | -7/+68 | |
|\ \ | |/ |/| | Add first_or_create family of methods to Active Record | |||||
| * | Adding `first_or_new` documentation to the AR Querying guide. | Nicolas Hock Isaza | 2011-08-30 | 1 | -1/+1 | |
| | | ||||||
| * | Adding first_or_create, first_or_create!, first_or_new and first_or_build to ↵ | Andrés Mejía | 2011-08-30 | 1 | -7/+68 | |
| | | | | | | | | | | | | | | | | | | | | Active Record. This let's you write things like: User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson", :hot => true) Related to #2420. | |||||
* | | getting_started.textile section 6: Correct file names in table | dharmatech | 2011-09-07 | 1 | -3/+3 | |
| | | ||||||
* | | Revert "Rails.root is a Pathname, no need to use File.join first." | Vijay Dev | 2011-09-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | This reverts commit 760fd1eb42038a64591036fc5d687afc98f272aa. Reason: We need a fully qualified path string here, not a Pathname. | |||||
* | | copy edit assets guide | Vijay Dev | 2011-09-07 | 1 | -19/+19 | |
| | | ||||||
* | | getting_started.textile: Fix another typo | dharmatech | 2011-09-07 | 1 | -1/+1 | |
| | | ||||||
* | | Rails.root is a Pathname, no need to use File.join first. | Joost Baaij | 2011-09-07 | 1 | -1/+1 | |
| | | ||||||
* | | Added note about adding a javascript runtime to Gemfile for production ↵ | Ryan Walker | 2011-09-06 | 1 | -0/+8 | |
| | | | | | | | | environment. | |||||
* | | Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch ↵ | Marcus Ilgner | 2011-09-06 | 1 | -9/+9 | |
| | | | | | | | | cannot be nested. | |||||
* | | Change hyphen to underscore. | Uģis Ozols | 2011-09-06 | 1 | -4/+4 | |
| | | ||||||
* | | getting_started.textile: fix minor typo | dharmatech | 2011-09-05 | 1 | -1/+1 | |
| | | ||||||
* | | Add reference about "bundle install --without assets" in Precompiling Assets ↵ | Guillermo Iguaran | 2011-09-04 | 1 | -0/+2 | |
| | | | | | | | | section. | |||||
* | | Add CoffeeScript example to JavaScript and ERB section | Guillermo Iguaran | 2011-09-04 | 1 | -1/+7 | |
| | | ||||||
* | | Add JavaScript and ERB section to Asset Guide | Guillermo Iguaran | 2011-09-04 | 1 | -0/+12 | |
| | | ||||||
* | | Fix grammar for content_tag_for and div_for docs. | Hendy Tanata | 2011-09-05 | 1 | -1/+1 | |
| | | ||||||
* | | clarify where the branch name will exist | Ray Baxter | 2011-09-04 | 1 | -1/+1 | |
| | | ||||||
* | | Merge docrails, resolving conflicts in the assets guide | Vijay Dev | 2011-09-04 | 9 | -24/+26 | |
|\ \ | ||||||
| * | | minor fixes in assets guide | Vijay Dev | 2011-09-04 | 1 | -11/+9 | |
| | | | ||||||
| * | | Added |t| to create_table block | Rinaldi Fonseca | 2011-09-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | add some missing dots in the docs | Vijay Dev | 2011-09-04 | 1 | -4/+4 | |
| | | | ||||||
| * | | Fix asset_path example in CSS and ERB section | Guillermo Iguaran | 2011-09-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | document send_file guesses content type from the file extension | Vijay Dev | 2011-09-03 | 1 | -1/+3 | |
| | | | | | | | | | | | | and remove info about x_send_file option to send_file | |||||
| * | | fix YUI description | Richard Hulse | 2011-09-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | YUI CSS compressor does not extend syntax! Also added link to more info | |||||
| * | | Fixed a typo in the section about migration. | David Peckham | 2011-09-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | some of the changes for validation earlier reverted from d20281a | Vijay Dev | 2011-09-03 | 3 | -4/+6 | |
| | | | ||||||
| * | | Change photos_path to photos_url in Using redirect_to | Franco Catena | 2011-09-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | Is more "correct" a complete url than only the path | |||||
* | | | Merge pull request #2841 from wojtekmach/app-generators-group | José Valim | 2011-09-04 | 2 | -0/+21 | |
|\ \ \ | | | | | | | | | Add gem group support to generators | |||||
| * | | | Add gem_group support to generators | Wojciech Mach | 2011-09-04 | 2 | -0/+21 | |
| | | | | ||||||
* | | | | Merge pull request #2816 from sikachu/content_tag_for | José Valim | 2011-09-04 | 1 | -0/+77 | |
|\ \ \ \ | | | | | | | | | | | Make `content_tag_for` and `div_for` accepts the array of records | |||||
| * | | | | Make `content_tag_for` and `div_for` accepts the array of records | Prem Sichanugrist | 2011-09-04 | 1 | -0/+77 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So instead of having to do this: @items.each do |item| content_tag_for(:li, item) do Title: <%= item.title %> end end You can now do this: content_tag_for(:li, @items) do |item| Title: <%= item.title %> end | |||||
* / / / | Modified content in guides and comments | Arun Agrawal | 2011-09-04 | 2 | -3/+3 | |
|/ / / | | | | | | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings! | |||||
* / / | fixes CSS example in the asset pipeline guide | Xavier Noria | 2011-09-03 | 1 | -1/+1 | |
|/ / | ||||||
* | | Revert "Fixing guides validation errors." | Vijay Dev | 2011-09-02 | 10 | -24/+18 | |
| | | | | | | | | | | | | This reverts commit d20281add192e5afba66e555ce67cf73943b033b. Reason: This needs more investigation. Will apply when this is verified. | |||||
* | | debug option to js, stylesheet tags are ignored when debug mode is off | Vijay Dev | 2011-09-02 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'fix_validation_errors' | Andrew Olson | 2011-09-02 | 10 | -17/+23 | |
|\ \ | ||||||
| * | | Fixing guides validation errors. | Andrew Olson | 2011-09-02 | 10 | -18/+24 | |
| | | | ||||||
* | | | When a collection is empty, render returns nil. | Matt Burke | 2011-09-02 | 1 | -0/+7 | |
| | | | ||||||
* | | | Change the styling of '<ruby>initialize</ruby>' to '+initialize+' (the ↵ | Stephen J. Butler | 2011-09-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | former breaks the HTML generation). | |||||
* | | | fix some minor omissions in pipeline docs | Richard Hulse | 2011-09-02 | 1 | -5/+18 | |
| | | | ||||||
* | | | Add #update_attributes as another alternative to #update_column. | Sebastian Martinez | 2011-09-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | Revert "Fix logic in 3.1 release notes sentence" | Vijay Dev | 2011-09-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 30d65da17e5fb1cdd3f10a6d14f4295b57e26286. Reason: This commit is incorrect. It is indeed recommended to use update_attribute when you want callbacks to be invoked. | |||||
* | | | Modified ActionMailer Basics doc with the following change: | Andy Leeper | 2011-09-01 | 1 | -2/+3 | |
| | | | | | | | | | | | | * Changed the lines that said <tt>config/environments/env.rb</tt> to <tt>config/environments/$RAILS_ENV.rb</tt>. People were mis-interpreting the filename to literally be env.rb. | |||||
* | | | Change "SCSS" to "Sass" in sentences where it's referred to as "language", ↵ | Roy Tomeij | 2011-09-01 | 1 | -5/+5 | |
|/ / | | | | | | | because Sass is the language (SCSS is one possible syntax within the Sass language), as per documentation on sass-lang.com. |