aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #24601 from prathamesh-sonpatki/fix-ar-changelogJeremy Daer2016-04-171-23/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Move CHANGELOG entry about database notices at the top [ci skip]Prathamesh Sonpatki2016-04-181-23/+20
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #24595 from maclover7/jm-cleanup-2Rafael França2016-04-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Specify that behavior will be deprecated in Rails 5.1Jon Moss2016-04-171-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #24551 from bogdanvlviv/notice_for_tasksJeremy Daer2016-04-178-14/+130
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added notice when a database is successfully created or dropped.bogdanvlviv2016-04-178-14/+130
* | | | | | | | | | | | | Merge pull request #24582 from vipulnsward/stop-passing-unused-payloads-to-in...Jeremy Daer2016-04-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Stop passing unused payloads to instrumentation block in cacheVipul A M2016-04-171-2/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #24592 from vipulnsward/properly-verify-expiresRichard Schneeman2016-04-172-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Properly verify that cache accepts and user `expires` value.Vipul A M2016-04-172-2/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #24591 from vipulnsward/test-partial-name-with-unicodeAkira Matsuda2016-04-182-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add render allows unicode text name in partials - 🍣Vipul A M2016-04-172-0/+5
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #22911 from Envek/database_commentsJeremy Daer2016-04-1615-37/+280
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add support for specifying comments for tables, columns, and indexes.Andrey Novikov2016-04-1615-37/+286
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #24574 from y-yagi/donot_remove_cable.jsJeremy Daer2016-04-162-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | don't remove `cable.js`yuuji.yaginuma2016-04-162-1/+15
| |/ / / / / / / / / / /
* | | | | | | | | | | | documentation for add_references index option [ci skip]Vipul A M2016-04-172-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | [ci skip] docs for add_references index optionAlex Handley2016-04-162-2/+12
* | | | | | | | | | | | Merge pull request #24565 from javiervidal/rails_update_taskKasper Timm Hansen2016-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a note about how to execute 'rails app:update' on 4.2 and earlier [ci skip]Javier Vidal2016-04-151-1/+1
* | | | | | | | | | | | | Merge pull request #24556 from vipulnsward/24542-changelogJeremy Daer2016-04-151-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add changelog for #24542Vipul A M2016-04-151-0/+6
* | | | | | | | | | | | | | Merge pull request #24559 from vipulnsward/fix-ac-testsJeremy Daer2016-04-152-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | - Fixed ActionCable::Connection::ClientSocketTest that was overriding ActionC...Vipul A M2016-04-152-5/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #24517 from estolfo/transform-keys-return-type-masterSean Griffin2016-04-152-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Restore Hash#transform_keys behavior to always return a Hash instanceEmily2016-04-122-1/+17
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Filter scalar values when params permit hashes or arraysSean Griffin2016-04-152-1/+14
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #24560 from javiervidal/20160415प्रथमेश Sonpatki2016-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix broken link in 'Ruby on Rails 4.0 Release Notes' [ci skip]Javier Vidal2016-04-151-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #24557 from y-yagi/update_example_to_specify_ac_mount_pathVipul A M2016-04-152-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | update example to specify the Action Cable mount path [ci skip]yuuji.yaginuma2016-04-152-8/+9
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #24549 from kamipo/fix_quoted_timeJeremy Daer2016-04-142-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Should keep quoting behaivor of a time column value in sqlite3 adapterRyuta Kamizono2016-04-152-3/+12
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #24540 from sgrif/sg-actioncable-callbacksSean Griffin2016-04-142-5/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Run Action Cable callbacks through the worker poolSean Griffin2016-04-132-5/+30
* | | | | | | | | | | | Merge pull request #24454 from iangilfillan/masterVipul A M2016-04-144-13/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | MariaDB Documentationiangilfillan2016-04-144-13/+15
* | | | | | | | | | | | Merge pull request #24542 from kamipo/add_quoted_timeJeremy Daer2016-04-133-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add `quoted_time` for truncating the date part of a time column valueRyuta Kamizono2016-04-143-1/+18
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #24522 from vipulnsward/run-mariadb-on-travisJeremy Daer2016-04-133-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Include running mariadb on travisVipul A M2016-04-143-4/+10
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #24543 from prathamesh-sonpatki/fix-ap-changelogRichard Schneeman2016-04-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] Remove extra `so` from the Action Pack CHANGELOGPrathamesh Sonpatki2016-04-141-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #24533 from vipulnsward/nodoc-versionSean Griffin2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | :nodoc: version method.Vipul A M2016-04-131-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #24525 from tomkadwill/action-mailer-base-docs2Vipul A M2016-04-141-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update ActionMailer base documentation [ci skip]Tom Kadwill2016-04-131-3/+3
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #24539 from bogdan/diry-keyword-argsSean Griffin2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed bug introduced in #24519. Makes build green againBogdan Gusiev2016-04-131-1/+1
* | | | | | | | | | | | | Merge pull request #24536 from vipulnsward/ruby-2-upgradingRafael França2016-04-131-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |