aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2836 from avakhov/action-controller-helpers-descVijay Dev2011-09-031-3/+6
|\ | | | | fix helpers behavior description
| * fix helpers behavior descriptionAlexey Vakhov2011-09-031-3/+6
| |
* | Merge pull request #2825 from guilleiguaran/bcrypt-ruby-commentsAaron Patterson2011-09-032-0/+9
|\ \ | | | | | | Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile
| * | Add comments about bcrypt-ruby gem to SecurePasswordGuillermo Iguaran2011-09-031-0/+6
| | |
| * | Add bcrypt-ruby to Gemfile templateGuillermo Iguaran2011-09-031-0/+3
| | |
* | | Merge pull request #2824 from arunagw/bcrypt_fixAaron Patterson2011-09-031-0/+1
|\ \ \ | |_|/ |/| | Need to add here to pass the test
| * | Need to add here to pass the testArun Agrawal2011-09-031-0/+1
| |/ | | | | As in previous commit it's removed.
* | Merge pull request #2827 from sikachu/extractable_ordered_hashJosé Valim2011-09-033-0/+12
|\ \ | |/ |/| Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!
| * Make `ActiveSupport::OrderedHash` extractable when using ↵Prem Sichanugrist2011-09-033-0/+12
| | | | | | | | | | `Array#extract_options!` `ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.
* | fixes CSS example in the asset pipeline guideXavier Noria2011-09-031-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-0212-83/+174
|\ \
| * | Revert "Fixing guides validation errors."Vijay Dev2011-09-0210-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 offVijay Dev2011-09-021-1/+1
| | |
| * | Merge branch 'fix_validation_errors'Andrew Olson2011-09-0210-17/+23
| |\ \
| | * | Fixing guides validation errors.Andrew Olson2011-09-0210-18/+24
| | | |
| * | | When a collection is empty, render returns nil.Matt Burke2011-09-021-0/+7
| | | |
| * | | Merge branch 'activemodel_typo_fix'Josh Nesbitt2011-09-021-1/+1
| |\ \ \
| | * | | Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class ↵Josh Nesbitt2011-09-021-1/+1
| |/ / / | | | | | | | | | | | | method, not attribute.
| * | | Change the styling of '<ruby>initialize</ruby>' to '+initialize+' (the ↵Stephen J. Butler2011-09-011-1/+1
| | | | | | | | | | | | | | | | former breaks the HTML generation).
| * | | fix some minor omissions in pipeline docsRichard Hulse2011-09-021-5/+18
| | | |
| * | | Add #update_attributes as another alternative to #update_column.Sebastian Martinez2011-09-011-1/+1
| | | |
| * | | Merge pull request #63 from carlosparamio/masterVijay Dev2011-09-011-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 routesCarlos Paramio2011-09-011-6/+6
| |/ / /
| * | | Revert "Fix logic in 3.1 release notes sentence"Vijay Dev2011-09-011-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 Leeper2011-09-011-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/masterVijay Dev2011-09-011-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 Tomeij2011-09-011-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 changesVijay Dev2011-09-013-4/+4
| |/ /
| * | Move css data URI into css/erb sectionRichard Hulse2011-09-011-8/+8
| | |
| * | pipeline docs improvementRichard Hulse2011-09-011-20/+25
| | | | | | | | | | | | | | | Some cleaning up of whitespace/punctuation and text refinements to clarify some things.
| * | pipeline docs - spelling and some whitespaceRichard Hulse2011-09-011-5/+5
| | |
| * | Adding reference about ExecJS for CoffeeScriptGuillermo Iguaran2011-09-011-2/+4
| | |
| * | Add reference to ExecJS in JavaScript Compression sectionGuillermo Iguaran2011-09-011-1/+3
| | |
| * | Fixing sass-rails helpers methods examplesGuillermo Iguaran2011-09-011-4/+4
| | |
| * | Giving info about what are the defaults for test environmentGuillermo Iguaran2011-09-011-1/+1
| | |
| * | update pipeline docs to reflect new defaultsRichard Hulse2011-09-011-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 Iguaran2011-08-311-1/+1
| | |
| * | Merge pull request #61 from gabebw/masterXavier Noria2011-08-312-2/+2
| |\ \ | | | | | | | | Improve examples by using .each instead of for...in
| | * | Improve examples: use each instead of for...inGabe Berke-Williams2011-08-312-2/+2
| |/ /
* | / Remove hard dependency on bcrypt.Guillermo Iguaran2011-09-023-3/+4
| |/ |/|
* | Merge pull request #2811 from avakhov/fix-environment-generator-actionJosé Valim2011-09-022-2/+2
|\ \ | | | | | | fix indent for generator environment method
| * | fix indent for generator environment methodAlexey Vakhov2011-09-022-2/+2
|/ /
* | * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731Aaron Patterson2011-09-013-2/+27
| |
* | make sure encoding_aware? is availableAaron Patterson2011-09-011-0/+2
| |
* | CookieJar is enumerable. fixes #2795Aaron Patterson2011-09-013-0/+23
| |
* | Merge pull request #2775 from jaw6/fix/reverseAaron Patterson2011-09-012-4/+7
|\ \ | | | | | | Fixes bug in ActiveRecord::QueryMethods, #1697
| * | Fixes bug in ActiveRecord::QueryMethods, #1697Joshua Wehner2011-08-312-4/+7
| | | | | | | | | Replace split on comma with a regexp that will reverse all ASC/DESC specifically
* | | Merge pull request #2718 from dasch/patch-5Vijay Dev2011-09-011-1/+4
|\ \ \ | | | | | | | | Split long string into multiple shorter ones
| * | | Split long string into multiple shorter ones Daniel Schierbeck2011-08-291-1/+4
| | | | | | | | | | | | This makes the code more readable.
* | | | Merge pull request #2585 from marcgg/fix-ruby19-splitoptionsJosé Valim2011-09-012-1/+20
|\ \ \ \ | | | | | | | | | | In some case ActiveResource fails to handle serialized attributes with Ruby 1.9 and crashes
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 11:37:00 +0000