aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22222 from y-yagi/fix_application_controller_require_depe...Godfrey Chan2015-11-082-1/+25
|\
| * fix application_controller require_dependency path generated by api scaffold ...yuuji.yaginuma2015-11-082-1/+25
* | Merge pull request #22224 from kassio/masterRafael França2015-11-083-2/+28
|\ \ | |/ |/|
| * Improve support for non Active Record objects on `validates_associated`Kassio Borges2015-11-083-2/+28
|/
* Merge pull request #22218 from EhsanYousefi/patch-2Richard Schneeman2015-11-071-2/+1
|\
| * Update belongs_to.rbEhsan Yousefi2015-11-081-2/+1
|/
* Merge pull request #21897 from swaathi/masterKasper Timm Hansen2015-11-077-14/+156
|\
| * Parameterize with options to preserve case of stringSwaathi K2015-11-077-14/+156
* | docs, get rid of artifact in `RecordFetchWarning` docs.Yves Senn2015-11-071-0/+2
* | docs, nodoc `EnumType`. [ci skip]Yves Senn2015-11-071-1/+1
* | docs, `ActiveRecord::JoinDependency` is not part of the public API.Yves Senn2015-11-071-1/+1
* | docs, `ActiveRecord::TypeCaster` is not part of the public API.Yves Senn2015-11-073-3/+3
* | Merge pull request #22197 from grosser/grosser/fetchKasper Timm Hansen2015-11-072-11/+14
|\ \
| * | do not override fetch on local cacheMichael Grosser2015-11-072-11/+14
* | | Merge pull request #21806 from kachick/fix-transformer-sizeEileen M. Uchitelle2015-11-074-8/+12
|\ \ \
| * | | Return a sized Enumerator from Hash#{transform_values{!}|transform_keys{!}}Kenichi Kamiya2015-09-294-8/+12
* | | | Fix test failuresSean Griffin2015-11-071-0/+1
* | | | Ensure `#reset_column_information` clears child classes as wellSean Griffin2015-11-073-0/+28
* | | | Merge pull request #22213 from y-yagi/remove_deprecated_option_from_guideRichard Schneeman2015-11-071-15/+0
|\ \ \ \
| * | | | remove deprecated `:tokenizer` option from guide [ci skip]yuuji.yaginuma2015-11-071-15/+0
| | |_|/ | |/| |
* | | | Merge pull request #22145 from atul-shimpi/masterYves Senn2015-11-071-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Issue #22139 : Edge Guides - ActiveRecord Migrations - Remove required option...atul-shimpi2015-11-011-2/+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