aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23795 from claudiob/replace-rack-with-rails-commandDavid Heinemeier Hansson2016-02-244-14/+64
|\
| * Invoke 'rails' instead of 'rake' in AppGeneratorclaudiob2016-02-202-11/+11
| * AppGenerator: Replace 'rake' with 'rails_command'claudiob2016-02-204-8/+58
* | Merge pull request #20851 from tomprats/indifferent-sessionsRafael Mendonça França2016-02-249-17/+147
|\ \
| * | Update Session to utilize indiffernt accessTom Prats2016-01-308-16/+127
| * | Update session to have indifferent accessTom Prats2016-01-293-2/+21
* | | Add changelog entry for #22825Rafael Mendonça França2016-02-241-0/+6
* | | Merge branch 'actionmailer-cache'Rafael Mendonça França2016-02-2416-69/+367
|\ \ \
| * | | Move private methods to the private visibilityRafael Mendonça França2016-02-242-22/+24
| * | | Move Caching module to Abstract ControllerRafael Mendonça França2016-02-237-18/+19
| * | | Change ActionMailer's default caching configuration and update generator's en...Stan Lo2016-02-234-1/+13
| * | | Remove unnecessarily included modules in ActionController::CachingStan Lo2016-02-231-1/+0
| * | | Move ActionMailer::Caching's content into ActionMailer::Base instead of inclu...Stan Lo2016-02-234-32/+21
| * | | Make caching configuration more flexibleStan Lo2016-02-233-11/+21
| * | | Move most caching methods to ActionDispatch::Caching, and let ActionMailer an...Stan Lo2016-02-234-109/+67
| * | | Move caching/fragments in ActionMailer and ActionController to action_dispatc...Stan Lo2016-02-234-159/+5
| * | | Porting ActionController::Caching to ActionMailer::CachingStan Lo2016-02-2311-0/+481
* | | | Merge pull request #23842 from kamipo/drop_table_test_text_limits_as_wellRafael França2016-02-231-9/+13
|\ \ \ \
| * | | | `drop_table :test_text_limits` as wellRyuta Kamizono2016-02-241-9/+13
* | | | | Use the trick to get beta releases in the GemfileRafael Mendonça França2016-02-231-1/+1
* | | | | Merge pull request #23836 from sstephenson/turbolinks-5Rafael França2016-02-236-17/+17
|\ \ \ \ \
| * | | | | Update JavaScript guide for Turbolinks 5Sam Stephenson2016-02-231-6/+6
| * | | | | Update to the latest Turbolinks gemsSam Stephenson2016-02-231-3/+3
| * | | | | New apps get the Turbolinks beta gemSam Stephenson2016-02-231-2/+2
| * | | | | Switch to `data-turbolinks-track="reload"`Sam Stephenson2016-02-233-6/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #23838 from kamipo/fix_assert_nothing_raised_deprecation_w...Rafael França2016-02-231-2/+3
|\ \ \ \ \
| * | | | | Fix `assert_nothing_raised` deprecation warning formatRyuta Kamizono2016-02-241-2/+3
| |/ / / /
* | | | | Merge pull request #23840 from yui-knk/improve_the_readability_of_ar_docJon Moss2016-02-231-6/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ci skip] Improve the readability of documents of nested_attributesyui-knk2016-02-241-6/+14
* | | | | Merge pull request #23837 from mgroeneman/fix-form-helper-guide-typoJon Moss2016-02-231-1/+1
|\ \ \ \ \
| * | | | | [ci skip] No hyphen in 'side effects'Michael Groeneman2016-02-231-1/+1
| * | | | | [ci skip] Fix typo in Form Helpers GuideMichael Groeneman2016-02-231-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #23632 from maclover7/fix-23620Matthew Draper2016-02-242-0/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix `request.ssl?` bug with Action CableJon Moss2016-02-232-0/+13
* | | | | Revert changes to validations from PR #18612eileencodes2016-02-239-89/+21
|/ / / /
* | | | Merge pull request #23734 from schneems/schneems/stdout-againRichard Schneeman2016-02-232-0/+15
|\ \ \ \
| * | | | Alternative to #23638 log to STDOUT via env varschneems2016-02-172-0/+15
* | | | | clear digest cache between testsAaron Patterson2016-02-231-0/+1
* | | | | Merge pull request #23628 from maclover7/fix-23625Sean Griffin2016-02-234-1/+38
|\ \ \ \ \
| * | | | | Fix issue #23625Jon Moss2016-02-184-1/+38
| |/ / / /
* | | | | Merge pull request #23789 from wisetara/wisetara/deprecate-args-ActiveSupport...Rafael França2016-02-2327-55/+68
|\ \ \ \ \
| * | | | | add deprecation warning to assert_nothing_raised and changelog entryTara Scherner de la Fuente2016-02-222-2/+15
| * | | | | update assert_nothing_raised in testing.mdTara Scherner de la Fuente2016-02-221-1/+1
| * | | | | remove args from assert_nothing_raised in testsTara Scherner de la Fuente2016-02-2225-54/+54
| | |/ / / | |/| | |
* | | | | reestablish previous connection after creating all databasesAaron Patterson2016-02-232-0/+17
* | | | | Merge pull request #23813 from lifo/faye-websocketDavid Heinemeier Hansson2016-02-235-7/+51
|\ \ \ \ \
| * | | | | Fix isAlive condition and add more loggingJavan Makhmali2016-02-231-5/+7
| * | | | | ActionCable.logJavan Makhmali2016-02-233-14/+25
| * | | | | Uninstall event handlers when replacing WebSocket instanceJavan Makhmali2016-02-231-0/+6
| * | | | | Connection#isAliveJavan Makhmali2016-02-231-3/+3