aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22038 from tgxworld/fix_random_error_when_running_tests_w...Kasper Timm Hansen2015-10-231-0/+6
|\
| * FIX: Randomly failing test when running without GIL.Guo Xiang Tan2015-10-231-0/+6
* | Merge pull request #22037 from kamipo/remove_no_need_binds_emptySean Griffin2015-10-231-3/+3
|\ \
| * | Remove no need `binds.empty?` checkingRyuta Kamizono2015-10-231-3/+3
| |/
* | Merge pull request #22041 from y-yagi/remove_unnecessary_files_indummy_applic...Richard Schneeman2015-10-232-1/+14
|\ \
| * | remove unnecessary readme in dummy applicationyuuji.yaginuma2015-10-232-1/+14
| |/
* | Merge pull request #22035 from yui-knk/update_doc_anonymousYves Senn2015-10-231-2/+4
|\ \ | |/ |/|
| * [ci skip] Add more code examples for `Module#anonymous?` docsyui-knk2015-10-231-2/+4
|/
* API guidelines reword re the Oxford comma [ci skip]Xavier Noria2015-10-221-3/+4
* Revert "[ci skip] removed extra comma"Xavier Noria2015-10-221-1/+1
* Merge pull request #22034 from hemalijain/patch-2Rafael Mendonça França2015-10-221-1/+1
|\
| * [ci skip] removed extra commahemali jain2015-10-231-1/+1
|/
* `config.generators` should be docummented since it is public APIRafael Mendonça França2015-10-221-1/+1
* Merge pull request #22029 from yui-knk/fixup_content_type_regexpRafael Mendonça França2015-10-221-1/+1
|\
| * Use sufficient a regexp anchor to check `@response.content_type.to_s`yui-knk2015-10-221-1/+1
* | Merge pull request #21918 from bogdan/refactor-preloaderSean Griffin2015-10-221-42/+30
|\ \
| * | Refactored association preloader for performanceBogdan Gusiev2015-10-221-42/+30
* | | Merge pull request #19327 from rousisk/masterSean Griffin2015-10-223-3/+19
|\ \ \ | |_|/ |/| |
| * | Change Integer#year to return a Fixnum instead of a Float to improve consistencyKonstantinos Rousis2015-10-223-3/+19
* | | Merge pull request #22028 from yui-knk/suppress_deprecated_warning_testKasper Timm Hansen2015-10-221-1/+1
|\ \ \ | |/ / |/| |
| * | Suppress warnings (warnings about AD::IntegrationTest HTTP request)yui-knk2015-10-221-1/+1
|/ /
* | Merge pull request #21950 from rafaelsales/issues/21922-fix-ar-group-by-attri...Andrew White2015-10-224-11/+17
|\ \
| * | Refactor Calculations#execute_grouped_calculation and clean AR test caseRafael Sales2015-10-222-11/+4
| * | Fix generated projection fields in group by queryRafael Sales2015-10-223-1/+14
* | | Merge pull request #22011 from kamipo/remove_unused_args_againAndrew White2015-10-224-24/+14
|\ \ \ | |/ / |/| |
| * | Remove `#tables` extra args againRyuta Kamizono2015-10-224-24/+14
|/ /
* | 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