aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #24356 from denofevil/fixture_filenameRafael França2016-03-302-1/+13
|\ \ \
| * | | provide file name for fixture ERBDennis Ushakov2016-03-302-1/+13
* | | | Merge pull request #23499 from bf4/ci_one_jrubyRafael França2016-03-303-2/+9
|\ \ \ \
| * | | | Run latest precompiled JRuby on CI only against ActionPackBenjamin Fleischer2016-03-303-2/+9
* | | | | Merge pull request #24366 from prathamesh-sonpatki/changelog-passRafael França2016-03-302-5/+3
|\ \ \ \ \
| * | | | | Pass over CHANGELOGs [ci skip]Prathamesh Sonpatki2016-03-302-5/+3
|/ / / / /
* | | | | Merge pull request #24331 from prathamesh-sonpatki/fix-puma-restartRafael França2016-03-307-1/+45
|\ \ \ \ \
| * | | | | Fix rails restart issue with PumaPrathamesh Sonpatki2016-03-307-1/+45
|/ / / / /
* | | | | Merge pull request #24365 from prathamesh-sonpatki/fix-deprecation-warningRafael França2016-03-301-1/+1
|\ \ \ \ \
| * | | | | Fix deprecation warning for ParamsParser instance :smile:Prathamesh Sonpatki2016-03-301-1/+1
|/ / / / /
* | | | | Deprecate ActionDispatch::ParamsParser instance.Rafael Mendonça França2016-03-302-0/+6
* | | | | Merge pull request #23895 from glaucocustodio/add_upcase_first_methodRafael Mendonça França2016-03-304-0/+22
|\ \ \ \ \
| * | | | | Add upcase_first methodGlauco Custódio2016-02-254-0/+22
* | | | | | Fix CHANGELOG entry [ci skip]Rafael Mendonça França2016-03-301-1/+1
* | | | | | Merge branch 'actioncable-notifications'Rafael Mendonça França2016-03-303-5/+97
|\ \ \ \ \ \
| * | | | | | Keep logging in the ActionCable::Channel::BaseRafael Mendonça França2016-03-303-110/+6
| * | | | | | Merge pull request #23723 from mwear/action_cable_notificationsRafael Mendonça França2016-03-295-8/+204
| |\ \ \ \ \ \
| | * | | | | | Add AS::Notifications and LogSubscriber to ActionCable::ChannelMatthew Wear2016-03-045-8/+204
* | | | | | | | Merge pull request #24362 from kamipo/add_test_create_record_with_pk_as_zeroRafael França2016-03-292-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a test case for create a record with primary key as zeroRyuta Kamizono2016-03-302-0/+7
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #24363 from kamipo/remove_except_helper_in_test_schemaRafael França2016-03-291-7/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove `except` helper for test schemaRyuta Kamizono2016-03-301-7/+1
| |/ / / / / /
* | | | | | | Merge pull request #24349 from chrisarcand/add-changelog-for-24305Rafael França2016-03-291-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Add changelog for #24305 [skip ci]Chris Arcand2016-03-281-0/+6
* | | | | | | | Merge pull request #24327 from bogdanvlviv/patch-2Rafael França2016-03-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update compatibility.rbBogdan2016-03-261-1/+1
* | | | | | | | | Merge pull request #24350 from y-yagi/update_assert_no_performed_jobs_docVipul A M2016-03-301-18/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | update `assert_no_performed_jobs` doc to use `assert_no_performed_jobs` metho...yuuji.yaginuma2016-03-301-18/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #24315 from kenta-s/add_empty_to_finder_methodsAndrew White2016-03-293-1/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Delegate some additional methods in querying.rbKenta2016-03-303-1/+34
| |/ / / / / / /
* | | | | | | | Merge pull request #24354 from greysteil/fix-typoVipul A M2016-03-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix typo in headers commentGrey Baker2016-03-291-1/+1
* | | | | | | | Merge pull request #24344 from codeodor/patch-1Vipul A M2016-03-281-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update how to clear the association cacheSammy Larbi2016-03-281-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #24343 from arekf/masterप्रथमेश Sonpatki2016-03-281-0/+2
|\ \ \ \ \ \ \
| * | | | | | | [skip ci] Update `numericality` validation docsArkadiusz Fal2016-03-281-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #24325 from y-yagi/show_correct_command_name_in_help_of_ra...Kasper Timm Hansen2016-03-271-3/+4
|\ \ \ \ \ \ \
| * | | | | | | show correct command name in help of rails runneryuuji.yaginuma2016-03-261-3/+4
* | | | | | | | Merge pull request #24337 from xw19/realations-properlyVipul A M2016-03-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] relations inside <tt> tagSourav Moitra2016-03-271-1/+1
* | | | | | | | | Merge pull request #24328 from bogdanvlviv/patch-3Vipul A M2016-03-271-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix description for method ActiveRecord::ConnectionAdapters::SchemaStatements...Bogdan2016-03-271-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #24334 from mabras/masterArun Agrawal2016-03-271-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | remove old-dead linkMohamad Abras2016-03-271-1/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #24333 from y-yagi/add_index_errors_option_to_exampleJon Moss2016-03-261-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | add `:index_errors` option to example [ci skip]yuuji.yaginuma2016-03-271-2/+2
|/ / / / / / / /
* | | | | | | | Cable: Shush pop warnings when skipping Postgres tests.Kasper Timm Hansen2016-03-261-0/+1
* | | | | | | | Shush up EM::Hiredis when running tests.Kasper Timm Hansen2016-03-261-0/+11
|/ / / / / / /
* | | | | | | Merge pull request #24326 from mechanicles/highlight-wordप्रथमेश Sonpatki2016-03-261-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Highlight the dynamic method finder 'find_by_' [ci skip]Santosh Wadghule2016-03-261-1/+2