aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | specify deprecated waring, follow the standard conventionsGaurav Sharma2015-10-282-6/+6
|/ / / / / / / / /
* | | | | | | | | Write the cookie jar it was not committed in TestCaseRafael Mendonça França2015-10-282-2/+2
* | | | | | | | | Remove dead codeRafael Mendonça França2015-10-281-5/+0
* | | | | | | | | Merge pull request #22095 from ajmyers01/fix_typo_in_eager_load_polymorphic_e...Rafael França2015-10-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Typo in EagerLoadPolymorphicError [ci skip]Alex Myers2015-10-271-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #18383 from scambra/habtm-with-where-includes-16032-for-ma...Rafael Mendonça França2015-10-273-1/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Includes HABTM returns correct size now. It's caused by the join dependencySergio Cambra2015-01-073-2/+41
* | | | | | | | | | Merge pull request #22093 from y-yagi/fix_typo_in_db_purgeRafael França2015-10-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix typo in `db:purge` description [ci skip]yuuji.yaginuma2015-10-281-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #22087 from yui-knk/fix_ar_changelogKasper Timm Hansen2015-10-271-17/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Aline code examples in AR changelogyui-knk2015-10-271-17/+14
* | | | | | | | | | | Merge pull request #22078 from arunagw/secret-key-as-an-integerSantiago Pastorino2015-10-272-0/+16
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | raise `ArgumentError` when `SECRET_KEY_BASE` is an integerArun Agrawal2015-10-272-0/+16
|/ / / / / / / / / /
* | | | | | | | | | Remove skipped JRuby tests that are passing on 9.0.3.0.Guo Xiang Tan2015-10-273-6/+0
* | | | | | | | | | Revert "Merge pull request #21994 from mtodd/inherit-scopes"Rafael Mendonça França2015-10-272-3/+3
* | | | | | | | | | Merge pull request #21994 from mtodd/inherit-scopesArthur Neves2015-10-262-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make inherited scope test failMatt Todd2015-10-262-3/+3
|/ / / / / / / / / /
* | | | | | | | | | [ci skip] Add doc for preloader_forschneems2015-10-261-0/+4
* | | | | | | | | | [ci skip] Clarify doc for preloaders_for_oneschneems2015-10-261-0/+5
* | | | | | | | | | [ci skip] Add doc to preloaders_onschneems2015-10-261-0/+1
* | | | | | | | | | Merge pull request #19686 from tsun1215/index_errorsSean Griffin2015-10-268-4/+95
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Errors can be indexed with nested attributesMichael Probber2015-04-178-4/+95
* | | | | | | | | | | Merge pull request #22080 from AnnaErshova/edits-config-code-textRafael França2015-10-261-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Edits default `config/boot.rb` to match what's generated by Rails 4.2.AnnaErshova2015-10-261-2/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #19924 from iamvery/db-tasks-exit-statusSean Griffin2015-10-266-5/+67
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update changelog with db rake task exit status fixJay Hayes2015-10-201-0/+4
| * | | | | | | | | | | Exit with non-zero status when db:drop failsJay Hayes2015-10-202-1/+12
| * | | | | | | | | | | Exit with non-zero status when db:create failsJay Hayes2015-10-204-3/+21
| * | | | | | | | | | | Fix test of drop failureJay Hayes2015-10-202-5/+6
| * | | | | | | | | | | Add tests to verify exit status for create/drop failuresJay Hayes2015-10-201-0/+28
* | | | | | | | | | | | [ci skip] Fix method documentation locationschneems2015-10-261-3/+2
* | | | | | | | | | | | Merge pull request #22071 from yui-knk/redefine_method_keep_visibilitySean Griffin2015-10-262-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Make `Module#redefine_method` to keep method visibilityyui-knk2015-10-262-1/+32
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #22064 from kamipo/do_not_omit_parenthesesSean Griffin2015-10-253-13/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not omit parentheses [ci skip]Ryuta Kamizono2015-10-253-13/+13
* | | | | | | | | | | | Merge pull request #22060 from sebmck/tweak-wordingClaudio B2015-10-255-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Tweaked wording used in some tests.Sebastian McKenzie2015-10-255-16/+16
* | | | | | | | | | | | | Merge pull request #22062 from y-yagi/fix_rdoc_markupYves Senn2015-10-251-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | fix rdoc markup [ci skip]yuuji.yaginuma2015-10-251-4/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #22040 from arunagw/remove-jruby-travis-optsYves Senn2015-10-241-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove JRUBY_OPTS from .travis.yml fileArun Agrawal2015-10-231-2/+0
* | | | | | | | | | | | Merge pull request #22054 from tgxworld/jruby_issue_fixedMatthew Draper2015-10-241-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove skip on tests that have been fixed.Guo Xiang Tan2015-10-241-4/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #22033 from jmccartie/jm/uuid_nilRafael Mendonça França2015-10-238-19/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Stop aligning the argumentsRafael Mendonça França2015-10-231-4/+4
| * | | | | | | | | | | | Use thor class_option to make the primary_key_type option workRafael Mendonça França2015-10-236-16/+20
| * | | | | | | | | | | | Move default uuid generation to active_recordJon McCartie2015-10-235-11/+16
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #22052 from piton4eg/patch-10Arthur Nogueira Neves2015-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix punctuation [ci skip]Markov Alexey2015-10-231-1/+1
* | | | | | | | | | | | | Merge pull request #21990 from greysteil/invalid-utf8-querystringsKasper Timm Hansen2015-10-234-7/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |