aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Copy shallow options from normal options when using scopeAndrew White2014-03-082-1/+50
* Pull namespace defaults out of the options hashAndrew White2014-03-082-3/+140
* Only use shallow nested scope when depth is > 1Andrew White2014-03-082-20/+83
* Move setting :scope_level_resource to resource_scopeAndrew White2014-03-081-7/+7
* Merge pull request #14313 from m-Peter/active_model_doc_fixesYves Senn2014-03-081-30/+49
|\
| * Fix errors for four of the code samplesPeter Markou2014-03-081-30/+49
|/
* Merge pull request #14325 from robin850/issue-12133Santiago Pastorino2014-03-083-1/+18
|\
| * Make the rails:template rake task load initializersRobin Dupret2014-03-083-1/+18
* | Merge pull request #14244 from arthurnn/orderd_hash_select_fixSantiago Pastorino2014-03-082-1/+8
|\ \
| * | Fix OrderedHash.select to return self instance.Arthur Neves2014-03-072-1/+8
* | | Merge pull request #14280 from joho/make_csrf_failure_logging_optionalSantiago Pastorino2014-03-083-1/+28
|\ \ \ | |_|/ |/| |
| * | Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-053-1/+28
* | | docs, shorten CsrfHelper description and refer to security guide. [ci skip]Yves Senn2014-03-081-8/+3
* | | added CSRF helper to rails guide documentation. Closes #11615. [ci skip]Yves Senn2014-03-081-3/+19
* | | Tests for indifferent access using full_messages_for. Closes #11916Pavel Penkov2014-03-081-0/+7
* | | Merge pull request #14318 from arthurnn/clean_preview_interceptorsAndrew White2014-03-071-0/+1
|\ \ \
| * | | Make sure we clean preview_interceptorsArthur Neves2014-03-071-0/+1
* | | | Merge pull request #14316 from the4dpatrick/masterArthur Nogueira Neves2014-03-071-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Add preventDefault() on click eventPatrick Perey2014-03-071-1/+3
|/ / /
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-078-22/+37
|\ \ \
| * | | fix typo app -> alldmathieu2014-03-071-1/+1
| * | | unscope doesn't remove only the default_scope, but all of them.dmathieu2014-03-071-4/+5
| * | | Update doc for TagHelper.Hendy Tanata2014-03-051-2/+8
| * | | Improve collision explanation for Hash#transform_keys.Hendy Tanata2014-02-281-3/+3
| * | | Fix code alignment in duplicable? guide.Hendy Tanata2014-02-271-2/+2
| * | | Improve guide for Hash#transform_keys and related methods.Hendy Tanata2014-02-271-6/+15
| * | | :scissors:Zachary Scott2014-02-233-3/+3
| * | | Tweak Configuring Guide languageGaurish Sharma2014-02-231-1/+1
| * | | typos fixesMikhail Dieterle2014-02-221-4/+4
* | | | Merge pull request #14257 from killthekitten/patch-1Vijay Dev2014-03-061-0/+20
|\ \ \ \
| * | | | [ci skip] Add "Low-Level Caching" part to "Caching With Rails"Nikolay Shebanov2014-03-061-0/+20
* | | | | Merge pull request #14285 from sikachu/master-revert-render-body-remove-conte...Aaron Patterson2014-03-068-51/+24
|\ \ \ \ \
| * | | | | Do note remove `Content-Type` when `render :body`Prem Sichanugrist2014-03-058-51/+24
* | | | | | Merge pull request #14296 from joker1007/fix_rails_guides_about_active_record...Yves Senn2014-03-061-1/+1
|\ \ \ \ \ \
| * | | | | | Fix guide about `config.active_record.default_timezone` [ci skip]joker10072014-03-061-1/+1
|/ / / / / /
* | | | | | Merge pull request #14101 from sikachu/master-fix-versioning-taskJeremy Kemper2014-03-0519-54/+167
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-0519-54/+167
|/ / / / /
* | | | | Remove a reference to an issue [ci skip]Robin Dupret2014-03-051-1/+1
* | | | | get rid of intermediate arrays.Yves Senn2014-03-051-2/+3
* | | | | we only need to support `asc` and `ASC`. No need for mixed cases. #14263Yves Senn2014-03-052-34/+25
* | | | | docs, flash message keys are normalized to strings. [ci skip]Yves Senn2014-03-051-0/+20
* | | | | quick pass over Active Record CHANGELOG. [ci skip].Yves Senn2014-03-051-13/+10
* | | | | Merge pull request #14263 from robin850/allow_passing_string_to_order_hashYves Senn2014-03-053-5/+52
|\ \ \ \ \
| * | | | | Allow string hash values on AR order methodMarcelo Casiraghi2014-03-043-5/+52
* | | | | | Merge pull request #14261 from MSch/bound-parameters-for-existsAaron Patterson2014-03-042-3/+20
|\ \ \ \ \ \
| * | | | | | Make exists? use bound values.Martin Schùˆrrer2014-03-042-3/+20
* | | | | | | Revert "Merge pull request #14269 from arthurnn/expanded_key_array"Godfrey Chan2014-03-043-14/+4
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #14269 from arthurnn/expanded_key_arrayGuillermo Iguaran2014-03-043-4/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Cache key should be different when is Array.Arthur Neves2014-03-033-4/+14
| |/ / / /
* | | | | Merge pull request #14243 from pch/digestor-variantsDavid Heinemeier Hansson2014-03-046-24/+105
|\ \ \ \ \