aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-01123-668/+1492
|\
| * Merge pull request #3185 from arunagw/void_context_warnings_removedJosé Valim2011-10-011-1/+1
| |\ | | | | | | Use of :: in void context Warning removed
| | * Use of :: in void context Warning removedArun Agrawal2011-10-011-1/+1
| |/
| * Merge pull request #3181 from yahonda/fix_uninitialized_constant_testfixturesJosé Valim2011-09-301-1/+1
| |\ | | | | | | Modified how to handle if ActiveRecord is defined.
| | * Modified how to handle if ActiveRecord is defined.Yasuo Honda2011-09-301-1/+1
| | |
| * | Provide read_attribute_for_serialization as the API to serialize attributes.José Valim2011-09-303-5/+30
| | |
| * | Set the default options value for as_json in the encoder object.José Valim2011-09-302-3/+3
| | |
| * | Merge pull request #3175 from nhocki/as-json-patchJosé Valim2011-09-302-1/+11
| |\ \ | | | | | | | | Allow default options for `as_json` method on models
| | * | Fixing `as_json` method for ActiveRecord models.Nicolás Hock Isaza2011-09-292-1/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you've got an AR Model and you override the `as_json` method, you should be able to add default options to the renderer, like this: class User < ActiveRecord::Base def as_json(options = {}) super(options.merge(:except => [:password_digest])) end end This was not possible before this commit. See the added test case.
| * | Merge pull request #3177 from arunagw/void_warnings_removedJosé Valim2011-09-301-4/+4
| |\ \ | | | | | | | | possibly useless use of :: in void context Warning removed
| | * | possibly useless use of :: in void context Warning removedArun Agrawal2011-09-301-4/+4
| | |/
| * | Merge pull request #3178 from arunagw/argument_warning_removedJosé Valim2011-09-301-1/+1
| |\ \ | | |/ | |/| warning removed : '&' interpreted as argument prefix
| | * warning removed : '&' interpreted as argument prefixArun Agrawal2011-09-301-1/+1
| |/
| * Add CHANGELOG entriesSantiago Pastorino2011-09-293-1/+67
| |
| * Don't call self.class unless necessary. Closes #3171.Jon Leighton2011-09-292-2/+3
| |
| * Merge pull request #3167 from ↵José Valim2011-09-292-1/+17
| |\ | | | | | | | | | | | | dmitriy-kiriyenko/honour_rails_env_environment_variable_when_running_rake RAILS_ENV environment variable is ignored when running rake from thor script using Rails::Generators::Actions
| | * Honour RAILS_ENV environment variable when running rake.Dmitriy Kiriyenko2011-09-292-1/+17
| |/
| * javascript_path and stylesheet_path should honor the asset pipeliningSantiago Pastorino2011-09-282-2/+28
| |
| * Merge pull request #3159 from elliterate/digest_auth_with_query_stringJosé Valim2011-09-282-1/+10
| |\ | | | | | | Fixed digest authentication for requests with a query string [#3158]
| | * Fixed digest authentication for requests with a query string [#3158]Colin Shield & Ian Lesperance2011-09-282-1/+10
| | |
| * | Merge pull request #3156 from ihower/enhance_button_to_helper_v2Santiago Pastorino2011-09-282-5/+19
| |\ \ | | |/ | |/| Make button_to helper support "form" option
| | * Make button_to helper support "form" option which is the form attributes.Wen-Tien Chang2011-09-292-5/+19
| | |
| * | partial pass over the assets guideXavier Noria2011-09-281-15/+12
| |/
| * fixing typo in assets guideVijay Dev2011-09-281-1/+1
| |
| * Merge pull request #3152 from rocky-jaiswal/fix-failed-ar-testJon Leighton2011-09-282-2/+2
| |\ | | | | | | Fixed failed test under 1.8.7 as map.keys order in indeterminable
| | * Fixed failed test under 1.8.7 as map.keys order in indeterminableRocky Jaiswal2011-09-282-2/+2
| |/
| * Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-requireSantiago Pastorino2011-09-271-0/+1
| |\ | | | | | | add missing require to html sanitizer
| | * add missing require to html sanitizerAlexey Vakhov2011-09-271-0/+1
| | |
| * | the infamous detail only spotted in GitHub diffs no matter how careful you ↵Xavier Noria2011-09-271-1/+1
| | | | | | | | | | | | were before pushing
| * | partial pass over the asset pipelineXavier Noria2011-09-271-14/+17
| |/
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-286-7/+32
| |\
| | * copy edit d47c2c4Vijay Dev2011-09-281-7/+1
| | |
| | * fixing docs for delete_sql where quotes should be used in this example.Diego Plentz2011-09-261-1/+1
| | |
| | * Alert about the new Bundler require for asset gems Nicolás Hock Isaza2011-09-261-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you are coming from a Rails 3.0 application, you won't have the correct Bundler require statement. This will cause the gems under the `assets` group not to be available in the development and production environment. I think this is related to the issue #39 in rails-sass https://github.com/rails/sass-rails/issues/39
| | * update ActionMailer example using last truncate helper method signatureAlexey Vakhov2011-09-261-2/+2
| | |
| | * fix ActionMailer readme exampleAlexey Vakhov2011-09-261-0/+2
| | |
| | * Fixed typo that I added - doh.Chris Kimpton2011-09-261-1/+1
| | |
| | * Clarify that the Active Record config should just work automaticallyChris Kimpton2011-09-261-1/+5
| | |
| | * add some notes on setup for Active Record testsChris Kimpton2011-09-261-0/+6
| | |
| | * pluralize "locales" since that's what's used in other parts of the document, ↵Waynn Lue2011-09-231-2/+2
| | | | | | | | | | | | and add a missing "on"
| | * Changed "en-UK" to "en-GB"Christopher Arrowsmith2011-09-221-1/+1
| | | | | | | | | | | | Signed-off-by: Christopher Arrowsmith <chris@agouti.co.uk>
| * | Merge pull request #3141 from jsl/make_ssl_configurableJosé Valim2011-09-274-3/+13
| |\ \ | | | | | | | | Make the Rack::SSL middleware configurable
| | * | Make the Rack::SSL middleware configurableJustin Leitgeb2011-09-264-3/+13
| |/ /
| * | partial pass over the asset pipeline guideXavier Noria2011-09-261-20/+22
| | |
| * | Don't require a DB connection when setting primary key.Jon Leighton2011-09-263-1/+20
| | | | | | | | | | | | Closes #2807.
| * | Merge pull request #3138 from christos/correct_image_path_with_pipelineSantiago Pastorino2011-09-262-2/+11
| |\ \ | | | | | | | | Correctly override image_path in sprockets rails_helper
| | * | Refactor image_path to use asset_path directlyChristos Zisopoulos2011-09-261-1/+1
| | | |
| | * | Correctly override image_path in sprockets rails_helperChristos Zisopoulos2011-09-262-1/+10
| | | |
| * | | Merge pull request #3136 from guilleiguaran/clear-digests-on-precompileSantiago Pastorino2011-09-262-0/+22
| | | | | | | | | | | | | | | | Avoid use of existing precompiled assets during rake assets:precompile run
| * | | Copy assets to nondigested filenames tooSantiago Pastorino2011-09-262-5/+11
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-20 18:18:32 +0000