aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26392 from y-yagi/chage_descendants_to_public_apiVipul A M2016-09-051-2/+15
|\
| * change `Class#descendants` to public API [ci skip]yuuji.yaginuma2016-09-051-2/+15
|/
* Merge pull request #26377 from y-yagi/rename_test_method_to_avoid_overridingEileen M. Uchitelle2016-09-041-1/+1
|\
| * rename test method to avoid overridingyuuji.yaginuma2016-09-031-1/+1
* | Merge pull request #26383 from kamipo/remove_unnecessary_count_for_collection...Eileen M. Uchitelle2016-09-042-36/+14
|\ \
| * | Remove unnecessary `count` method for collection proxyRyuta Kamizono2016-09-042-36/+14
* | | Merge pull request #26384 from y-yagi/make_fixture_file_upload_in_integration...Eileen M. Uchitelle2016-09-043-1/+43
|\ \ \ | |/ / |/| |
| * | make `fixture_file_upload` work in integration testsyuuji.yaginuma2016-09-043-1/+43
| |/
* | Merge pull request #26382 from naw/transaction-callback-docsVipul A M2016-09-042-1/+9
|\ \
| * | Update docs for change in transaction callback exceptionsNathan Wenneker2016-09-032-1/+9
|/ /
* | Merge pull request #26371 from duffyjp/masterGuillermo Iguaran2016-09-031-1/+4
|\ \
| * | Allow download of email attachments in the Mailer Preview template.jpd8002016-09-021-1/+4
| |/
* | Merge pull request #26375 from kamipo/remove_blank_else_branchGuillermo Iguaran2016-09-031-3/+0
|\ \
| * | Remove blank else branchRyuta Kamizono2016-09-031-3/+0
* | | Merge pull request #26381 from kamipo/extract_duplicated_create_for_associationYves Senn2016-09-033-16/+8
|\ \ \
| * | | Extract duplicated `create` and `create!` definition for associationRyuta Kamizono2016-09-033-16/+8
|/ / /
* | | Merge pull request #26374 from kamipo/fix_broken_heredoc_indentationXavier Noria2016-09-0321-107/+108
|\ \ \ | |/ / |/| |
| * | Fix broken heredoc indentation caused by rubocop auto-correctRyuta Kamizono2016-09-0321-107/+108
|/ /
* | Merge pull request #26373 from y-yagi/add_active_job_bug_report_templates_to_...Guillermo Iguaran2016-09-021-0/+1
|\ \ | |/ |/|
| * add Active Job bug report templates to guide [ci skip]yuuji.yaginuma2016-09-031-0/+1
|/
* Merge pull request #26364 from y-yagi/fix_class_name_typo_in_bug_report_templ...Kasper Timm Hansen2016-09-022-4/+4
|\
| * fix class name typoyuuji.yaginuma2016-09-022-4/+4
* | Merge pull request #26365 from riseshia/patch-1Vipul A M2016-09-021-2/+1
|\ \ | |/ |/|
| * Improve Getting Started [ci skip]Shia2016-09-021-2/+1
|/
* Merge pull request #26362 from prathamesh-sonpatki/add-aj-bug-report-templatesGuillermo Iguaran2016-09-022-0/+63
|\
| * Added bug report templates for Active JobPrathamesh Sonpatki2016-09-022-0/+63
* | Merge pull request #26361 from wytesk133/masterप्रथमेश Sonpatki2016-09-021-1/+1
|\ \ | |/ |/|
| * Grammar fix [ci skip]Waitaya Krongapiradee2016-09-021-1/+1
|/
* apply case-in-assignment patternXavier Noria2016-09-022-11/+13
* RuboCop is 100% green :tada:Xavier Noria2016-09-029-44/+53
* fix RuboCop errors re \xFCXavier Noria2016-09-021-2/+4
* fixes remaining RuboCop issues [Vipul A M, Xavier Noria]Xavier Noria2016-09-0140-71/+71
* Cache to_datetime for performanceAndrew White2016-09-011-1/+1
* Merge pull request #26354 from shingo-nakanishi/fix_documentVipul A M2016-09-011-1/+2
|\
| * fix document for radio_buttonshingo-nakanishi2016-09-011-1/+2
|/
* Merge pull request #26351 from y-yagi/fix_ruby_warningSean Griffin2016-08-311-3/+3
|\
| * remove warning from `video_tag`yuuji.yaginuma2016-09-011-3/+3
* | Merge pull request #25758 from vipulnsward/fix-key-len-issueMatthew Draper2016-09-014-9/+39
|\ \ | |/ |/|
| * Start passing cipher from EncryptedCookieJar since we use it to determine key...Vipul A M2016-09-014-22/+26
| * Follow up of #25602Vipul A M2016-09-013-15/+41
|/
* Merge pull request #26346 from Devinsuit/masterJon Moss2016-08-311-1/+1
|\
| * Update Jason Zimdars twitterDevinsuit2016-08-311-1/+1
* | Add changelog entry for #26328.Kasper Timm Hansen2016-08-311-0/+7
* | Move to_param undef closer to the deprecations.Kasper Timm Hansen2016-08-311-2/+4
* | Merge pull request #26328 from kirs/strong-params-to-paramKasper Timm Hansen2016-08-312-0/+9
|\ \ | |/ |/|
| * Do not allow to_param on AC::ParametersKir Shatrov2016-08-312-0/+9
* | Include user defined attributes in inspectSean Griffin2016-08-312-1/+7
* | Remove deprecated handling of PG PointsSean Griffin2016-08-316-56/+32
* | Merge pull request #26332 from y-yagi/use_specified_message_in_assert_changesSean Griffin2016-08-312-1/+10
|\ \
| * | use `message` that specified in argument to error messageyuuji.yaginuma2016-08-312-1/+10