aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24379 from Gaurav2728/sanitizer-helper-update-docKasper Timm Hansen2016-03-311-1/+1
|\
| * sanitiser helper may be remove in 5.1, update doc [ci skip]Gaurav Sharma2016-03-311-1/+1
* | Revert "Deprecate table names containing dots"Sean Griffin2016-03-312-15/+0
* | Merge pull request #24377 from bogdanvlviv/fix_upcase_firstRafael França2016-03-314-4/+16
|\ \
| * | Fix method String#upcase_firstbogdanvlviv2016-03-314-4/+16
| |/
* | Merge pull request #23658 from kamipo/move_quoted_names_cache_up_to_abstract_...Rafael França2016-03-317-19/+20
|\ \
| * | Move `@quoted_{column|table}_names` cache up to the abstract adapterRyuta Kamizono2016-03-317-19/+20
| |/
* | Merge pull request #24385 from morgoth/deprecate-datetime_field_tagRafael França2016-03-315-9/+41
|\ \
| * | Deprecate `datetime_field` and `datetime_field_tag` helpers.Wojciech Wnętrzak2016-03-315-9/+41
| |/
* | Prepared statements shouldn't share a cache with unprepared statementsSean Griffin2016-03-312-3/+16
* | Deprecate table names containing dotsSean Griffin2016-03-312-0/+15
* | Ensure associations still work when the table name contains a dotSean Griffin2016-03-313-4/+6
* | Merge pull request #24381 from Tensho/filter-parameters-partial-matchRafael França2016-03-313-1/+5
|\ \
| * | [ci skip] Parameter filter performs regular expression partial matchingAndrew Babichev2016-03-313-1/+5
|/ /
* | Merge pull request #24233 from jeremy/cable/encodingJeremy Daer2016-03-3118-154/+245
|\ \
| * | Cable message encodingJeremy Daer2016-03-3118-154/+245
|/ /
* | Merge pull request #24376 from jeremy/cable/downsize-worker-pool-default-sizeJeremy Daer2016-03-312-2/+12
|\ \ | |/ |/|
| * Cable: reconcile default worker pool size with low db conn pool sizeJeremy Daer2016-03-302-2/+12
* | Merge pull request #24368 from kamipo/make_to_private_the_visibilitySean Griffin2016-03-304-32/+54
|\ \
| * | Make to private the visibility of `_quote` and `_type_cast`Ryuta Kamizono2016-03-304-32/+54
* | | Merge pull request #24373 from silatham99/remove-meth-from-railsJon Moss2016-03-301-3/+3
|\ \ \ | |_|/ |/| |
| * | Replace _meth with _method to remove ambiguityScott Latham2016-03-301-3/+3
|/ /
* | Merge pull request #24371 from yui-knk/update_gemfile_lockRafael França2016-03-301-1/+1
|\ \
| * | Update Gemfile.lockyui-knk2016-03-311-1/+1
* | | Merge pull request #24370 from yui-knk/suppress_warningsRafael França2016-03-302-6/+12
|\ \ \ | |/ / |/| |
| * | Suppress warningsyui-knk2016-03-312-6/+12
|/ /
* | 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