aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge pull request #22019 from timoschilling/patch-2Sean Griffin2015-10-211-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | remove unnecessary forwardable requireTimo Schilling2015-10-211-1/+0
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #22018 from jbranchaud/move-getter-to-attr-readerAndrew White2015-10-211-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Extract native getter to attr_reader.jbranchaud2015-10-211-5/+1
* | | | | | | | | | | | | | | | | Merge pull request #20026 from rails/remove-possible-singleton-methodAndrew White2015-10-213-4/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add Module#remove_possible_singleton_methodAndrew White2015-10-213-4/+32
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | move documentation of column options to `add_column`. Closes #20400.Yves Senn2015-10-212-79/+81
* | | | | | | | | | | | | | | | Merge pull request #22013 from NelsonScott/patch-1Yves Senn2015-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | typoScott Nelson2015-10-201-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Really fix test failures caused by #19851Sean Griffin2015-10-201-5/+6
* | | | | | | | | | | | | | | Fix test failures caused by #19851Sean Griffin2015-10-201-5/+5
* | | | | | | | | | | | | | | Merge pull request #22008 from rails/revert-19898-common-secretsSean Griffin2015-10-201-16/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert " Added an example to show how common secrets can be shared across mul...Sean Griffin2015-10-201-16/+0
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #19851 from repinel/numericality-validation2Sean Griffin2015-10-202-13/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Conditionally convert the raw_value received by the numeric validator.Roque Pinel2015-07-112-13/+47
* | | | | | | | | | | | | | | | Merge pull request #19889 from cedrics/long-uri-encoded-keysSean Griffin2015-10-202-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | when checking for too long cache keys used the uri encoded fname Cedric Sohrauer2015-04-242-3/+9
* | | | | | | | | | | | | | | | | Merge pull request #19898 from prathamesh-sonpatki/common-secretsSean Griffin2015-10-201-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Added example of sharing secrets in multiple environments in secrets.ymlPrathamesh Sonpatki2015-05-261-0/+16
* | | | | | | | | | | | | | | | | | Merge pull request #19938 from vngrs/join_dependency_instantiate_bugSean Griffin2015-10-206-6/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix merge conflicts for #19938Sean Griffin2015-10-206-6/+29
|/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix for activerecord join dependency instantiate bugMehmet Emin İNAÇ2015-05-046-6/+29
* | | | | | | | | | | | | | | | | | | Merge pull request #19992 from greysteil/handle-invalid-utf8-in-html-escapeSean Griffin2015-10-203-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Handle invalid UTF-8 strings when HTML escapingGrey Baker2015-06-083-4/+19
* | | | | | | | | | | | | | | | | | | | Fix minor typo from #20038Sean Griffin2015-10-201-2/+2
* | | | | | | | | | | | | | | | | | | | Merge pull request #20482 from nashby/collection-label-forSean Griffin2015-10-200-0/+0
* | | | | | | | | | | | | | | | | | | | Collection check boxes propagates input's id to the label's for attribute.Vasiliy Ermolovich2015-10-203-0/+18
* | | | | | | | | | | | | | | | | | | | Merge pull request #20038 from imanel/numeric_prependSean Griffin2015-10-203-44/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Unify behavior of all Numeric extensions and use Module.prepend instead of al...Bernard Potocki2015-05-283-44/+22
* | | | | | | | | | | | | | | | | | | | | Merge pull request #20653 from repinel/allow-arel-select-countSean Griffin2015-10-202-1/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Allow select with Arel and count as well as calculations with ArelRoque Pinel2015-06-302-1/+55
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #21762 from jmccartie/jm/uuidSean Griffin2015-10-204-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Set active_record config for always creating uuids in generatorsJon McCartie2015-10-204-1/+26
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #20715 from simsalabim/feature/parse-rss-atom-as-xmlSean Griffin2015-10-203-14/+22
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #20737 from gouravtiwari/multibyte_chars_slice_fixSean Griffin2015-10-203-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Update #20737 to address feedbackSean Griffin2015-10-203-2/+18
| * | | | | | | | | | | | | | | | | | | | | | | Fixed slice! behavior: return nil for out-of-bound parametersGourav Tiwari2015-10-202-1/+6
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #20768 from vrybas/guides-clarify-belongs-to-required-by-d...Sean Griffin2015-10-201-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Update #20768 to address feedbackSean Griffin2015-10-201-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | [Rails Guides] Clarify `belongs_to_required_by_default` optionVladimir Rybas2015-10-201-1/+3
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #20795 from benjiwheeler/validation_guide_ret_valSean Griffin2015-10-201-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | activerecord guide: clarified roles of valid method and errors object [ci skip]Ben Wheeler2015-07-081-7/+15
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #20872 from maxjacobson/more-humane-roundingSean Griffin2015-10-203-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Update the changelog for #20872 to be a bit less confusingSean Griffin2015-10-201-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | Round some numbers more humanelyMax Jacobson2015-07-263-2/+11
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #20934 from maurogeorge/migration-transformations-docSean Griffin2015-10-201-15/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Add missed Available transformations to migration DocMauro George2015-07-221-15/+50
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #20957 from akihiro17/find-by-issueSean Griffin2015-10-203-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Don't cache arguments in #find_by if they are an ActiveRecord::Relationakihiro172015-10-063-1/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #21302 from theunraveler/delegate_reserved_argument_namesSean Griffin2015-10-202-5/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \