Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add comments about bcrypt-ruby gem to SecurePassword | Guillermo Iguaran | 2011-09-03 | 1 | -0/+6 |
| | |||||
* | 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 | 12 | -83/+174 |
|\ | |||||
| * | 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 |
| | | | |||||
| * | | 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 |
| |/ | |||||
* | | Remove hard dependency on bcrypt. | Guillermo Iguaran | 2011-09-02 | 3 | -3/+4 |
| | | |||||
* | | Merge pull request #2811 from avakhov/fix-environment-generator-action | José Valim | 2011-09-02 | 2 | -2/+2 |
|\ \ | | | | | | | fix indent for generator environment method | ||||
| * | | fix indent for generator environment method | Alexey Vakhov | 2011-09-02 | 2 | -2/+2 |
|/ / | |||||
* | | * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731 | Aaron Patterson | 2011-09-01 | 3 | -2/+27 |
| | | |||||
* | | make sure encoding_aware? is available | Aaron Patterson | 2011-09-01 | 1 | -0/+2 |
| | | |||||
* | | CookieJar is enumerable. fixes #2795 | Aaron Patterson | 2011-09-01 | 3 | -0/+23 |
| | | |||||
* | | Merge pull request #2775 from jaw6/fix/reverse | Aaron Patterson | 2011-09-01 | 2 | -4/+7 |
|\ \ | | | | | | | Fixes bug in ActiveRecord::QueryMethods, #1697 | ||||
| * | | Fixes bug in ActiveRecord::QueryMethods, #1697 | Joshua Wehner | 2011-08-31 | 2 | -4/+7 |
| | | | | | | | | | Replace split on comma with a regexp that will reverse all ASC/DESC specifically | ||||
* | | | Merge pull request #2718 from dasch/patch-5 | Vijay Dev | 2011-09-01 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Split long string into multiple shorter ones | ||||
| * | | | Split long string into multiple shorter ones | Daniel Schierbeck | 2011-08-29 | 1 | -1/+4 |
| | | | | | | | | | | | | This makes the code more readable. | ||||
* | | | | Merge pull request #2585 from marcgg/fix-ruby19-splitoptions | José Valim | 2011-09-01 | 2 | -1/+20 |
|\ \ \ \ | | | | | | | | | | | In some case ActiveResource fails to handle serialized attributes with Ruby 1.9 and crashes | ||||
| * | | | | Do not use objects that don't respond to to_sym (integers, floats, dates...) ↵ | Marc G Gauthier | 2011-09-01 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | as parameters | ||||
| * | | | | Do not try to use as a parameter elements that are not acceptable | Marc G Gauthier | 2011-08-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2788 from spohlenz/precompile-without-digests-master | José Valim | 2011-09-01 | 2 | -4/+31 |
|\ \ \ \ \ | | | | | | | | | | | | | assets:precompile should not append asset digests when config.assets.digest is false | ||||
| * | | | | | assets:precompile should not append asset digests when config.assets.digest ↵ | Sam Pohlenz | 2011-09-01 | 2 | -4/+31 |
|/ / / / / | | | | | | | | | | | | | | | | is false | ||||
* | | | | | Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-master | José Valim | 2011-09-01 | 1 | -1/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Add missing changelog entries for 3.1.1 | ||||
| * | | | | | Add missing changelog entries for 3.1.1 | Guillermo Iguaran | 2011-09-01 | 1 | -1/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #2786 from spohlenz/extract-asset-paths-config-master | José Valim | 2011-09-01 | 1 | -5/+14 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper |