aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove deprecated `:tokenizer` option from guide [ci skip]yuuji.yaginuma2015-11-071-15/+0
* Merge pull request #22211 from atul-shimpi/masterKasper Timm Hansen2015-11-071-1/+1
|\
| * Add comma to to make the information clearUbuntu2015-11-071-1/+1
* | Fix wrong `assert_equal` argument order.Kasper Timm Hansen2015-11-071-2/+2
* | Merge pull request #22207 from yui-knk/suppress_warningsKasper Timm Hansen2015-11-071-1/+1
|\ \ | |/ |/|
| * Suppress warning (warning about assigned but unused variable)yui-knk2015-11-071-1/+1
|/
* Merge pull request #21967 from kevinbuch/connection-middleware-mutationRichard Schneeman2015-11-063-4/+15
|\
| * Avoids mutating the original response in connection management middlewareKevin Buchanan2015-11-063-4/+15
|/
* Merge pull request #22203 from cllns/guides-has-many-through-join-modelsEileen M. Uchitelle2015-11-061-2/+4
|\
| * Clarify automatic creation/deletion of join models for has_many throughSean Collins2015-11-061-2/+4
* | Merge pull request #22193 from grosser/grosser/multiEileen M. Uchitelle2015-11-061-3/+3
|\ \
| * | call local_cache 1 time instead of 3 timesMichael Grosser2015-11-061-3/+3
| |/
* | Merge pull request #22200 from grosser/grosser/prependKasper Timm Hansen2015-11-063-30/+27
|\ \ | |/ |/|
| * use prepend instead of extending every instanceMichael Grosser2015-11-063-30/+27
|/
* Merge pull request #22194 from grosser/grosser/read-nilSean Griffin2015-11-052-3/+14
|\
| * cache nil replies from backend cache so misses are fast tooMichael Grosser2015-11-052-3/+14
* | Merge pull request #22150 from raq929/patch-1Yves Senn2015-11-051-2/+4
|\ \
| * | Update association_basics.mdraq9292015-11-011-2/+4
* | | [ci skip] ( ͡° ͜ʖ ͡°) ( ͡⊙ ͜ʖ ͡⊙) ( ͡◉ ͜ʖ ͡◉) javascrip...Kasper Timm Hansen2015-11-051-1/+1
* | | [ci skip] Remove final mentions of `static_cache_control` in docs.Kasper Timm Hansen2015-11-052-2/+6
* | | Merge pull request #22187 from kamipo/test_binary_data_is_not_logged_is_for_p...Andrew White2015-11-051-1/+1
|\ \ \
| * | | `test_binary_data_is_not_logged` is for prepared statements loggingRyuta Kamizono2015-11-051-1/+1
* | | | Merge pull request #22189 from kamipo/no_need_mysql_doubles_reset_column_info...Yves Senn2015-11-052-24/+12
|\ \ \ \
| * | | | No need `MysqlDouble` and `MysqlDouble.reset_column_information`Ryuta Kamizono2015-11-052-24/+12
* | | | | Merge pull request #22191 from jonatack/fix-static-cache-control-deprecation-...Kasper Timm Hansen2015-11-051-3/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix `static_cache_control` deprecation warningJon Atack2015-11-051-3/+6
|/ / / /
* | | | Require the count_down_latchRafael Mendonça França2015-11-051-2/+3
* | | | Merge pull request #22185 from jdantonio/cr-load-timeRafael França2015-11-0523-25/+27
|\ \ \ \
| * | | | Require only necessary concurrent-ruby classes.Jerry D'Antonio2015-11-0423-25/+27
* | | | | Remove links to docrailsRafael Mendonça França2015-11-051-2/+2
* | | | | Add bundle check to release taskRafael Mendonça França2015-11-051-1/+5
|/ / / /
* | | | tests, test should not care wether 9ms or 11ms have passed.Yves Senn2015-11-041-1/+1
* | | | Replace `serve_static_files` mentions in docs.Kasper Timm Hansen2015-11-044-6/+8
* | | | Replace `serve_static_files` in tests with `public_file_server.enabled`.Kasper Timm Hansen2015-11-044-5/+5
* | | | tests, define `Rails.root` before loading Action Mailer.Yves Senn2015-11-042-8/+8
* | | | Merge pull request #22173 from kaspth/enable-public-file-serverKasper Timm Hansen2015-11-047-17/+84
|\ \ \ \
| * | | | Move `static_cache_contorl` deprecation changelog entry to Railties.Kasper Timm Hansen2015-11-042-5/+22
| * | | | Add enabled flag to the public file server.Kasper Timm Hansen2015-11-036-12/+62
* | | | | Merge pull request #22182 from seanlinsley/patch-1Rafael França2015-11-041-0/+7
|\ \ \ \ \
| * | | | | document `try!` in ActiveSupport core ext guideSean Linsley2015-11-041-0/+7
|/ / / / /
* | | | | Merge pull request #22180 from usertesting/arbitrary-url-in-link-to-backRafael França2015-11-043-2/+33
|\ \ \ \ \
| * | | | | Don’t allow arbitrary data in back urlsDamien Burke2015-11-033-2/+33
| |/ / / /
* | | | | formatting pass over Active Record changelog. [ci skip]Yves Senn2015-11-041-18/+20
* | | | | Merge pull request #22174 from metaskills/defsetupYves Senn2015-11-043-7/+6
|\ \ \ \ \
| * | | | | Update docs/comments to use setup/teardown blocks vs. methods.Ken Collins2015-11-041-1/+0
| * | | | | Update docs/comments to use setup/teardown blocks vs. methods.Ken Collins2015-11-033-6/+6
| |/ / / /
* | / / / Remove incorrect commentsAndrew White2015-11-041-4/+0
| |/ / / |/| | |
* | | | Fix spelling error [ci skip]Andrew White2015-11-041-1/+1
* | | | don't start a new process for every test fileAaron Patterson2015-11-031-8/+21
* | | | Fix deprecation message when frame doesn't have absolute_pathRafael Mendonça França2015-11-031-1/+1
|/ / /