Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Basic --webpack delegation to new webpacker gem (#27288) | David Heinemeier Hansson | 2016-12-09 | 2 | -1/+16 | |
* | | | | | | Merge pull request #27314 from kamipo/add_changelog_for_25451 | Matthew Draper | 2016-12-10 | 1 | -8/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add a changelog entry for #25451 [ci skip] | Ryuta Kamizono | 2016-12-10 | 1 | -8/+13 | |
* | | | | | | | Do not raise exception when content_type is a empty string | Rafael Mendonça França | 2016-12-09 | 2 | -1/+6 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #27248 from stefanmb/master | Sean Griffin | 2016-12-09 | 4 | -5/+67 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Emulate db trigger behaviour for after_commit :destroy, :update | Stefan Budeanu | 2016-12-09 | 4 | -5/+67 | |
|/ / / / / / | ||||||
* | | | / / | Show message if Yarn is not installed (#27312) | Guillermo Iguaran | 2016-12-09 | 1 | -1/+8 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge pull request #27311 from y-yagi/remove_assert_send | Kasper Timm Hansen | 2016-12-09 | 1 | -1/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | remove deprecated `assert_send` from assertion list [ci skip] | yuuji.yaginuma | 2016-12-09 | 1 | -1/+0 | |
|/ / / / / | ||||||
* | | | | | Only have Yarn bundling commented out as we cant be sure Yarn is installed | David Heinemeier Hansson | 2016-12-08 | 2 | -5/+2 | |
* | | | | | Fix ability to run railties test suite | David Heinemeier Hansson | 2016-12-08 | 1 | -0/+1 | |
* | | | | | fix broken tests (#27308) | Yuji Yaginuma | 2016-12-08 | 1 | -3/+2 | |
* | | | | | specify `skip_yarn` option in API-only Application (#27309) | Yuji Yaginuma | 2016-12-08 | 2 | -3/+12 | |
* | | | | | Merge pull request #27303 from toshimaru/fix/partial-variable-block | Matthew Draper | 2016-12-09 | 4 | -5/+17 | |
|\ \ \ \ \ | ||||||
| * | | | | | split DELEGATION_RESERVED_METHOD_NAMES in half | Toshimaru | 2016-12-09 | 5 | -10/+17 | |
| * | | | | | Enable `block` variable in view | Toshimaru | 2016-12-09 | 3 | -1/+6 | |
* | | | | | | Resolve association class correctly when assigning ids on a through association | Matthew Draper | 2016-12-09 | 3 | -1/+12 | |
* | | | | | | Make ActiveModel::Errors backward compatible with 4.2 | Rafael Mendonça França | 2016-12-08 | 2 | -2/+29 | |
* | | | | | | Merge pull request #27304 from utilum/fix_test_breaker | Sean Griffin | 2016-12-08 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix test breaking error uninitialized constant ActiveRecord::Type::Value. | utilum | 2016-12-08 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #25051 from bf4/extract_notes_as_binary | Sean Griffin | 2016-12-08 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Extract notes from files in binary | Benjamin Fleischer | 2016-09-05 | 1 | -1/+1 | |
* | | | | | | Merge pull request #26696 from iainbeeston/only-ruby-types-in-activemodel | Sean Griffin | 2016-12-08 | 10 | -35/+33 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Moved database-specific ActiveModel types into ActiveRecord | Iain Beeston | 2016-10-14 | 10 | -34/+33 | |
* | | | | | | | Merge pull request #26529 from prathamesh-sonpatki/fix-alias-attribute-issue | Sean Griffin | 2016-12-08 | 4 | -3/+43 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Check whether the current attribute being write is aliased or not before writing | Prathamesh Sonpatki | 2016-12-09 | 3 | -2/+20 | |
| * | | | | | | | Check whether the current attribute being read is aliased or not before reading | Prathamesh Sonpatki | 2016-12-08 | 3 | -2/+24 | |
* | | | | | | | | Make Yarn the default, drop default vendor/asset directories (#27300) | David Heinemeier Hansson | 2016-12-08 | 11 | -111/+34 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #27278 from kamipo/should_be_sync_primary_key_definition | Sean Griffin | 2016-12-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Should be sync the `primary_key` definition with actually created | Ryuta Kamizono | 2016-12-06 | 1 | -1/+1 | |
* | | | | | | | | Add some documentation around internal APIs [ci skip] | Sean Griffin | 2016-12-08 | 1 | -0/+22 | |
* | | | | | | | | Merge pull request #27185 from kamipo/fix_apply_seconds_precision | Sean Griffin | 2016-12-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix `apply_seconds_precision` not to be affected by `mathn` | Ryuta Kamizono | 2016-11-27 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #27289 from matthewd/fixture-file-module | Matthew Draper | 2016-12-08 | 2 | -18/+22 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Only move fixture_file_upload to IntegrationTest | Matthew Draper | 2016-12-07 | 2 | -18/+22 | |
* | | | | | | | | | | Merge pull request #27271 from printercu/permantent_digest_in_tests | Matthew Draper | 2016-12-08 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fixed usage of cache_template_loading | Max Melentiev | 2016-12-06 | 2 | -1/+9 | |
* | | | | | | | | | | | Merge pull request #27290 from lastgabs/active-model-docs | Kasper Timm Hansen | 2016-12-07 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add Action View to Active Model API documentation | Gabi Stefanini | 2016-12-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | Fixes API wording to match API conventions | Gabi Stefanini | 2016-12-06 | 1 | -2/+2 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #27251 from ebeigarts/fix-autosave | Sean Griffin | 2016-12-06 | 2 | -3/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Improve test without using anonymous classes | Edgars Beigarts | 2016-12-06 | 1 | -27/+24 | |
| * | | | | | | | | | | | Reload association scope inside autosaved associations | Edgars Beigarts | 2016-12-02 | 2 | -3/+30 | |
* | | | | | | | | | | | | Merge pull request #27286 from alexcameron89/document_recent_regex_change | Sean Griffin | 2016-12-06 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | [ci skip] Document regex change | Alex Kitchens | 2016-12-06 | 1 | -0/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #27285 from MSP-Greg/MSP-Greg_doc1 | Matthew Draper | 2016-12-07 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | ActionCable::Connection::Base doc code sample syntax error | MSP-Greg | 2016-12-06 | 1 | -4/+1 | |
* | | | | | | | | | | | Merge pull request #25451 from kamipo/translate_not_null_violation_to_specifi... | Sean Griffin | 2016-12-06 | 7 | -8/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Translate NOT NULL violation to the specific exception | Ryuta Kamizono | 2016-12-06 | 7 | -8/+33 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #27275 from kamipo/should_inherit_statement_invalid | Sean Griffin | 2016-12-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | |