aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #24421 from arthur-vieira/patch-1Rafael França2016-04-041-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Fix variable nameArthur Vieira2016-04-041-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24304 from rthbound/24239-workAndrew White2016-04-043-1/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes #24239Ryan T. Hosford2016-04-043-1/+31
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #24332 from blackchestnut/doc/deprecation_warnSantiago Pastorino2016-04-041-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Added 'config.' to deprecation warningAlexander Kalinichev2016-03-261-2/+2
* | | | | | | | | Merge pull request #24247 from ypxing/refactor_substitute_valuesAndrew White2016-04-041-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | enhance ActiveRecord#substitute_values to loop values just onceRick Xing2016-03-191-5/+5
* | | | | | | | | | Match `String#to_time`'s behaviour to rubySiim Liiser2016-04-043-1/+14
* | | | | | | | | | Call super instead of returning nil for DateTime#<=>Andrew White2016-04-033-5/+29
* | | | | | | | | | Use block form of Dir.mktmpdir to ensure tidy upAndrew White2016-04-031-3/+3
* | | | | | | | | | Prevent void context warningsAndrew White2016-04-032-2/+2
* | | | | | | | | | Merge pull request #24406 from prathamesh-sonpatki/update-release-notesKasper Timm Hansen2016-04-031-10/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Rails 5 release notes [ci skip]Prathamesh Sonpatki2016-04-031-10/+0
* | | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-04-035-4/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | s/documention/documentation/Vipul A M2016-03-291-1/+1
| * | | | | | | | | | [ci skip] Fix example of ActionController::Parameters#to_unsafe_hPrathamesh Sonpatki2016-03-241-1/+1
| * | | | | | | | | | s/responsibilty/responsibility/Vipul A M2016-03-222-2/+2
| * | | | | | | | | | format as code [ci-skip]Gaurish Sharma2016-03-141-1/+1
| * | | | | | | | | | Add example for ActionController::Parameters#to_unsafe_hGaurish Sharma2016-03-121-0/+7
* | | | | | | | | | | Merge pull request #24403 from vipulnsward/etag-doc-passJeremy Daer2016-04-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Grammar fixes based on pass over ETag doc changesVipul A M2016-04-031-2/+2
* | | | | | | | | | | | Merge pull request #24404 from y-yagi/remove_deprecated_methodArthur Nogueira Neves2016-04-021-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | remove deprecated `datetime_field` from guide [ci skip]yuuji.yaginuma2016-04-031-2/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #24398 from yui-knk/remove_not_need_includeArthur Nogueira Neves2016-04-022-7/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove not needed includingyui-knk2016-04-022-7/+0
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #24400 from utilum/Grammer_fix_in_commentVipul A M2016-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Grammer fix in comment: capitalize first word in sentence [ci skip].utilum2016-04-021-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24387 from jeremy/strong-etagJeremy Daer2016-04-016-63/+210
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Strong ETag validatorsJeremy Daer2016-03-316-63/+210
* | | | | | | | | | Merge pull request #24388 from javiervidal/20160331Arun Agrawal2016-04-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixes broken link in 'Ruby on Rails 2.2 Release Notes' [ci skip]Javier Vidal2016-04-011-1/+1
|/ / / / / / / / /
* | | | | | | | | 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