Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 4 | -1/+61 |
|\ \ | | | | | | | Add gem group support to generators | ||||
| * | | Add gem_group support to generators | Wojciech Mach | 2011-09-04 | 4 | -1/+61 |
| | | | |||||
* | | | 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 | ||||
* | | | | Remove useless parens | Santiago Pastorino | 2011-09-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Modified content in guides and comments | Arun Agrawal | 2011-09-04 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings! | ||||
* | | | | Warnings removed for "assert_match /" Please do | Arun Agrawal | 2011-09-04 | 6 | -25/+25 |
| | | | | | | | | | | | | | | | | not add more.! | ||||
* | | | | Warnings removed for using shadow variable. | Arun Agrawal | 2011-09-04 | 2 | -4/+4 |
| | | | | |||||
* | | | | restores the API docs of AR::Fixtures, made a quick pass over them, revises ↵ | Xavier Noria | 2011-09-03 | 1 | -1/+1 |
| |/ / |/| | | | | | | | | link in fixture template [closes #2840] | ||||
* | | | Add bcrypt-ruby to Gemfile template | Guillermo Iguaran | 2011-09-03 | 1 | -0/+3 |
|/ / | |||||
* / | fixes CSS example in the asset pipeline guide | Xavier Noria | 2011-09-03 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-02 | 5 | -70/+161 |
|\ | |||||
| * | 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. | ||||
| * | Move css data URI into css/erb section | Richard Hulse | 2011-09-01 | 1 | -8/+8 |
| | | |||||
| * | pipeline docs improvement | Richard Hulse | 2011-09-01 | 1 | -20/+25 |
| | | | | | | | | | | Some cleaning up of whitespace/punctuation and text refinements to clarify some things. | ||||
| * | pipeline docs - spelling and some whitespace | Richard Hulse | 2011-09-01 | 1 | -5/+5 |
| | | |||||
| * | Adding reference about ExecJS for CoffeeScript | Guillermo Iguaran | 2011-09-01 | 1 | -2/+4 |
| | | |||||
| * | Add reference to ExecJS in JavaScript Compression section | Guillermo Iguaran | 2011-09-01 | 1 | -1/+3 |
| | | |||||
| * | Fixing sass-rails helpers methods examples | Guillermo Iguaran | 2011-09-01 | 1 | -4/+4 |
| | | |||||
| * | Giving info about what are the defaults for test environment | Guillermo Iguaran | 2011-09-01 | 1 | -1/+1 |
| | | |||||
| * | update pipeline docs to reflect new defaults | Richard Hulse | 2011-09-01 | 1 | -32/+93 |
| | | | | | | | | | | | | | | | | | | | | | | Production section has been changed to reflect the new default of precompilation and using the asset manifest. Development has been swapped around to reflect the new default (debug mode is on). Other changes to support this elsewhere. | ||||
| * | Review config.assets options. | Guillermo Iguaran | 2011-08-31 | 1 | -1/+1 |
| | | |||||
* | | fix indent for generator environment method | Alexey Vakhov | 2011-09-02 | 2 | -2/+2 |
| | | |||||
* | | assets:precompile should not append asset digests when config.assets.digest ↵ | Sam Pohlenz | 2011-09-01 | 1 | -0/+26 |
| | | | | | | | | is false | ||||
* | | Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes | Santiago Pastorino | 2011-08-31 | 2 | -1/+14 |
| | | | | | | | | Assets pipeline: fix in manifest location and remove unused code | ||||
* | | should be using a / in this route rather than a # | Aaron Patterson | 2011-08-31 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-08-31 | 3 | -2/+14 |
|\ | |||||
| * | Added new asset config options to guides | Richard Hulse | 2011-09-01 | 1 | -0/+12 |
| | | |||||
| * | Update wording surrounding template file extensions to include Rails 3 and ↵ | Greg Leppert | 2011-08-31 | 1 | -1/+1 |
| | | | | | | | | above. | ||||
| * | make code example agree with text just above | Ray Baxter | 2011-08-31 | 1 | -1/+1 |
| | |