| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | |||||
| * | 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 | 38 | -136/+282 |
| | |\ | |||||
| | * | | Fix typo: => instead of = | Semyon Perepelitsa | 2011-08-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 | 3 | -0/+21 |
| | | | | |||||
| * | | | Backport f443f9cb0c64 to master | Guillermo Iguaran | 2011-08-31 | 4 | -22/+24 |
| | | | | |||||
| * | | | 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 | 3 | -4/+74 |
| | | | | |||||
| * | | | 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 |
| | | | | | |||||
| * | | | | release notes: adds a couple of blank lines to get the markup right | Xavier Noria | 2011-08-31 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | adds the release notes of 3.1 to the index | Xavier Noria | 2011-08-31 | 2 | -0/+5 |
| |/ / / | |||||
| * | | | adds the asset pipeline guide to the index | Xavier Noria | 2011-08-30 | 3 | -2/+7 |
| | | | | |||||
| * | | | Merge pull request #2684 from waynn/patch-2 | Xavier Noria | 2011-08-30 | 1 | -4/+4 |
| |\ \ \ | | | | | | | | | Rephrasing to sound more natural, and some grammar fixes. | ||||
| | * | | | incorporate feedback from vijaydev and dasch to rephrase this to sound more ↵ | Waynn Lue | 2011-08-26 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | natural, and some grammar fixes. | ||||
| * | | | | Merge pull request #2720 from biow0lf/master | Xavier Noria | 2011-08-29 | 1 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | Doc fixes | ||||
| | * | | | | Documentation fixes | Igor Zubkov | 2011-08-29 | 1 | -4/+4 |
| | | |/ / | |/| | | |||||
| * / | | | Merge pull request #2723 from guilleiguaran/3-1-0-changelogs | Santiago Pastorino | 2011-08-28 | 1 | -0/+13 |
| |/ / / | | | | | | | | | | Update changelogs for Rails 3.1.0 | ||||
| * | | | Fix failing asset debug test under 1.8 | Guillermo Iguaran | 2011-08-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2681 from guilleiguaran/doc-changes | Xavier Noria | 2011-08-25 | 2 | -1/+12 |
| |\ \ \ | | | | | | | | | Documentation changes: Assets Pipeline guide and Railties changelog | ||||
| | * | | | Update Debugging Assets section of Assets Pipeline guide | Guillermo Iguaran | 2011-08-25 | 1 | -1/+8 |
| | | | | | |||||
| | * | | | Add missing CHANGELOG entries for Railties | Guillermo Iguaran | 2011-08-25 | 1 | -0/+4 |
| | |/ / | |||||
| * | | | Revert all the stuff to do with disallowing non-public methods for ↵ | Jon Leighton | 2011-08-25 | 1 | -24/+0 |
| | | | | | | | | | | | | | Module#delegate | ||||
| * | | | Yes we need this to pass the test. we are using config.log_level. | Arun Agrawal | 2011-08-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Fix broken test test_copying_migrations(RailtiesTest::EngineTest): NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c> | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |