Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #22237 from yukas/patch-1 | Kasper Timm Hansen | 2015-11-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Minor fix in Module#mattr_reader documentation | Yuri Kasperovich | 2015-11-09 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #22155 from jcoleman/patch-1 | Eileen M. Uchitelle | 2015-11-09 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Clarify i18n active[model/record] key differences | James Coleman | 2015-11-08 | 1 | -0/+2 | |
* | | | | | | | Merge pull request #22230 from y-yagi/fix_method_name_typo | Richard Schneeman | 2015-11-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix method name typo [ci skip] | yuuji.yaginuma | 2015-11-09 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #22226 from boone/docs | Sean Griffin | 2015-11-08 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed wording. | Mike Boone | 2015-11-08 | 3 | -3/+3 | |
* | | | | | | | | Merge pull request #22225 from arnvald/allow_host_in_js_css_helpers | Santiago Pastorino | 2015-11-08 | 3 | -2/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Allow `host` option in javscript and css helpers | Grzegorz Witek | 2015-11-08 | 3 | -2/+8 | |
* | | | | | | | | | Merge pull request #22206 from grosser/grosser/dry | Santiago Pastorino | 2015-11-08 | 1 | -20/+15 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | dry up increment/decrement | Michael Grosser | 2015-11-07 | 1 | -20/+15 | |
* | | | | | | | | | Merge pull request #22222 from y-yagi/fix_application_controller_require_depe... | Godfrey Chan | 2015-11-08 | 2 | -1/+25 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix application_controller require_dependency path generated by api scaffold ... | yuuji.yaginuma | 2015-11-08 | 2 | -1/+25 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #22224 from kassio/master | Rafael França | 2015-11-08 | 3 | -2/+28 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Improve support for non Active Record objects on `validates_associated` | Kassio Borges | 2015-11-08 | 3 | -2/+28 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #22218 from EhsanYousefi/patch-2 | Richard Schneeman | 2015-11-07 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update belongs_to.rb | Ehsan Yousefi | 2015-11-08 | 1 | -2/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #21897 from swaathi/master | Kasper Timm Hansen | 2015-11-07 | 7 | -14/+156 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Parameterize with options to preserve case of string | Swaathi K | 2015-11-07 | 7 | -14/+156 | |
* | | | | | | | | | docs, get rid of artifact in `RecordFetchWarning` docs. | Yves Senn | 2015-11-07 | 1 | -0/+2 | |
* | | | | | | | | | docs, nodoc `EnumType`. [ci skip] | Yves Senn | 2015-11-07 | 1 | -1/+1 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | docs, `ActiveRecord::JoinDependency` is not part of the public API. | Yves Senn | 2015-11-07 | 1 | -1/+1 | |
* | | | | | | | | docs, `ActiveRecord::TypeCaster` is not part of the public API. | Yves Senn | 2015-11-07 | 3 | -3/+3 | |
* | | | | | | | | Merge pull request #22197 from grosser/grosser/fetch | Kasper Timm Hansen | 2015-11-07 | 2 | -11/+14 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | do not override fetch on local cache | Michael Grosser | 2015-11-07 | 2 | -11/+14 | |
* | | | | | | | | Merge pull request #21806 from kachick/fix-transformer-size | Eileen M. Uchitelle | 2015-11-07 | 4 | -8/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Return a sized Enumerator from Hash#{transform_values{!}|transform_keys{!}} | Kenichi Kamiya | 2015-09-29 | 4 | -8/+12 | |
* | | | | | | | | | Fix test failures | Sean Griffin | 2015-11-07 | 1 | -0/+1 | |
* | | | | | | | | | Ensure `#reset_column_information` clears child classes as well | Sean Griffin | 2015-11-07 | 3 | -0/+28 | |
* | | | | | | | | | Merge pull request #22213 from y-yagi/remove_deprecated_option_from_guide | Richard Schneeman | 2015-11-07 | 1 | -15/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove deprecated `:tokenizer` option from guide [ci skip] | yuuji.yaginuma | 2015-11-07 | 1 | -15/+0 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #22145 from atul-shimpi/master | Yves Senn | 2015-11-07 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Issue #22139 : Edge Guides - ActiveRecord Migrations - Remove required option... | atul-shimpi | 2015-11-01 | 1 | -2/+0 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #22211 from atul-shimpi/master | Kasper Timm Hansen | 2015-11-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add comma to to make the information clear | Ubuntu | 2015-11-07 | 1 | -1/+1 | |
* | | | | | | | | | Fix wrong `assert_equal` argument order. | Kasper Timm Hansen | 2015-11-07 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #22207 from yui-knk/suppress_warnings | Kasper Timm Hansen | 2015-11-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Suppress warning (warning about assigned but unused variable) | yui-knk | 2015-11-07 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #21967 from kevinbuch/connection-middleware-mutation | Richard Schneeman | 2015-11-06 | 3 | -4/+15 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Avoids mutating the original response in connection management middleware | Kevin Buchanan | 2015-11-06 | 3 | -4/+15 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #22203 from cllns/guides-has-many-through-join-models | Eileen M. Uchitelle | 2015-11-06 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Clarify automatic creation/deletion of join models for has_many through | Sean Collins | 2015-11-06 | 1 | -2/+4 | |
* | | | | | | | | Merge pull request #22193 from grosser/grosser/multi | Eileen M. Uchitelle | 2015-11-06 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | call local_cache 1 time instead of 3 times | Michael Grosser | 2015-11-06 | 1 | -3/+3 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #22200 from grosser/grosser/prepend | Kasper Timm Hansen | 2015-11-06 | 3 | -30/+27 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | use prepend instead of extending every instance | Michael Grosser | 2015-11-06 | 3 | -30/+27 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #22194 from grosser/grosser/read-nil | Sean Griffin | 2015-11-05 | 2 | -3/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | cache nil replies from backend cache so misses are fast too | Michael Grosser | 2015-11-05 | 2 | -3/+14 | |
* | | | | | | | | Merge pull request #22150 from raq929/patch-1 | Yves Senn | 2015-11-05 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ |