| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | Merge branch 'activemodel_typo_fix' | Josh Nesbitt | 2011-09-02 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class ↵ | Josh Nesbitt | 2011-09-02 | 1 | -1/+1 |
| |/ / | | | | | | | method, not attribute. | ||||
| * | | 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 |
| | | | |||||
| * | | Merge pull request #63 from carlosparamio/master | Vijay Dev | 2011-09-01 | 1 | -6/+6 |
| |\ \ | | | | | | | Fix name of parent resource params when declaring nested resources at routes | ||||
| | * | | Fix name of parent resource params when declaring nested resources at routes | Carlos Paramio | 2011-09-01 | 1 | -6/+6 |
| |/ / | |||||
| * | | 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. | ||||
| * | | Merge pull request #62 from roytomeij/master | Vijay Dev | 2011-09-01 | 1 | -5/+5 |
| |\ \ | | | | | | | Call Sass by it's proper name while talking about the language, instead of using "SCSS" (which is a syntax within Sass). | ||||
| | * | | 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. | ||||
| * / | docs formatting changes | Vijay Dev | 2011-09-01 | 3 | -4/+4 |
| |/ | |||||
| * | 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 |
| | | |||||
| * | Merge pull request #61 from gabebw/master | Xavier Noria | 2011-08-31 | 2 | -2/+2 |
| |\ | | | | | Improve examples by using .each instead of for...in | ||||
| | * | Improve examples: use each instead of for...in | Gabe Berke-Williams | 2011-08-31 | 2 | -2/+2 |
| |/ | |||||
| * | 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 |
| | | | |||||
| * | | Instructions for nginx and apache added | Kir | 2011-08-31 | 1 | -2/+28 |
| |/ | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-08-31 | 2 | -3/+50 |
| |\ | |||||
| | * | Add section to pipeline docs to help people upgrading | Richard Hulse | 2011-09-01 | 1 | -0/+47 |
| | | | | | | | | | These are the options from a brand new app, and should help people get it right when upgrading. | ||||
| | * | Fixing spelling, throught -> through. | Andrew Olson | 2011-08-31 | 1 | -1/+1 |
| | | | |||||
| | * | Fix logic in 3.1 release notes sentence | Rodrigo Rosenfeld Rosas | 2011-08-31 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of git://github.com/rails/rails | Xavier Noria | 2011-08-31 | 177 | -1815/+2490 |
| | |\ | |||||
| | * | | Fix typo: => instead of = | Semyon Perepelitsa | 2011-08-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2772 from guilleiguaran/backports-assets-pipeline | José Valim | 2011-08-31 | 10 | -36/+160 |
| |\ \ \ | | | | | | | | | Backports of the assets pipeline changes done in 3-1-stable | ||||
| | * | | | Fix asset debugging tests to reflect last changes in 3-1-stable | Guillermo Iguaran | 2011-08-31 | 1 | -9/+18 |
| | | | | | |||||
| | * | | | Set default location of manifest with config.assets.manifest | Guillermo Iguaran | 2011-08-31 | 5 | -2/+30 |
| | | | | | |||||
| | * | | | Backport f443f9cb0c64 to master | Guillermo Iguaran | 2011-08-31 | 8 | -52/+41 |
| | | | | | |||||
| | * | | | Backport b0f30631662 to master | Guillermo Iguaran | 2011-08-31 | 1 | -3/+2 |
| | | | | | |||||
| | * | | | Read digests of assets from manifest.yml if config.assets.manifest is on | Guillermo Iguaran | 2011-08-31 | 6 | -6/+105 |
| |/ / / | |||||
| * | | | Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them ↵ | Chris Griego | 2011-08-31 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | public." to support date implementations without private to_date/to_datetime on Time (home_run). This reverts commit 080345baca1076a9788dff4803153600aec31f86. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | | Always enable digest and compile in the Rake task | Guillermo Iguaran | 2011-08-31 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge pull request #2706 from mitio/doc-changes | Vijay Dev | 2011-08-31 | 1 | -11/+11 |
| |\ \ \ | |_|/ |/| | | Fixed some typos and made minor text changes in the Plugins guide. | ||||
| | * | | Fixed typos and made minor changes in the Plugins guide. | Dimitar Dimitrov | 2011-08-27 | 1 | -11/+11 |
| | | | | |||||
| * | | | syncs assets guide with what's in 3-1-stable | Xavier Noria | 2011-08-31 | 1 | -11/+27 |
| | | | | |||||
| * | | | Merge pull request #2761 from raybaxter/bump_api_url | Xavier Noria | 2011-08-31 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | don't need edgeapi now that we are on 3.1 | ||||
| | * | | | don't need edgeapi now that we are on 3.1 | Ray Baxter | 2011-08-30 | 1 | -1/+1 |
| | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |