aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | gemfile entry method need to return an empty array rather than nil (#27318)Yuji Yaginuma2016-12-091-4/+4
* | | | | | Use GitHub webpacker until closer to releaseDavid Heinemeier Hansson2016-12-091-1/+1
* | | | | | Basic --webpack delegation to new webpacker gem (#27288)David Heinemeier Hansson2016-12-092-1/+16
* | | | | | Merge pull request #27314 from kamipo/add_changelog_for_25451Matthew Draper2016-12-101-8/+13
|\ \ \ \ \ \
| * | | | | | Add a changelog entry for #25451 [ci skip]Ryuta Kamizono2016-12-101-8/+13
* | | | | | | Do not raise exception when content_type is a empty stringRafael Mendonça França2016-12-092-1/+6
|/ / / / / /
* | | | | | Merge pull request #27248 from stefanmb/masterSean Griffin2016-12-094-5/+67
|\ \ \ \ \ \
| * | | | | | Emulate db trigger behaviour for after_commit :destroy, :updateStefan Budeanu2016-12-094-5/+67
|/ / / / / /
* | | | / / Show message if Yarn is not installed (#27312)Guillermo Iguaran2016-12-091-1/+8
| |_|_|/ / |/| | | |
* | | | | Merge pull request #27311 from y-yagi/remove_assert_sendKasper Timm Hansen2016-12-091-1/+0
|\ \ \ \ \
| * | | | | remove deprecated `assert_send` from assertion list [ci skip]yuuji.yaginuma2016-12-091-1/+0
|/ / / / /
* | | | | Only have Yarn bundling commented out as we cant be sure Yarn is installedDavid Heinemeier Hansson2016-12-082-5/+2
* | | | | Fix ability to run railties test suiteDavid Heinemeier Hansson2016-12-081-0/+1
* | | | | fix broken tests (#27308)Yuji Yaginuma2016-12-081-3/+2
* | | | | specify `skip_yarn` option in API-only Application (#27309)Yuji Yaginuma2016-12-082-3/+12
* | | | | Merge pull request #27303 from toshimaru/fix/partial-variable-blockMatthew Draper2016-12-094-5/+17
|\ \ \ \ \
| * | | | | split DELEGATION_RESERVED_METHOD_NAMES in halfToshimaru2016-12-095-10/+17
| * | | | | Enable `block` variable in viewToshimaru2016-12-093-1/+6
* | | | | | Resolve association class correctly when assigning ids on a through associationMatthew Draper2016-12-093-1/+12
* | | | | | Make ActiveModel::Errors backward compatible with 4.2Rafael Mendonça França2016-12-082-2/+29
* | | | | | Merge pull request #27304 from utilum/fix_test_breakerSean Griffin2016-12-081-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix test breaking error uninitialized constant ActiveRecord::Type::Value.utilum2016-12-081-0/+1
|/ / / / /
* | | | | Merge pull request #25051 from bf4/extract_notes_as_binarySean Griffin2016-12-081-1/+1
|\ \ \ \ \
| * | | | | Extract notes from files in binaryBenjamin Fleischer2016-09-051-1/+1
* | | | | | Merge pull request #26696 from iainbeeston/only-ruby-types-in-activemodelSean Griffin2016-12-0810-35/+33
|\ \ \ \ \ \
| * | | | | | Moved database-specific ActiveModel types into ActiveRecordIain Beeston2016-10-1410-34/+33
* | | | | | | Merge pull request #26529 from prathamesh-sonpatki/fix-alias-attribute-issueSean Griffin2016-12-084-3/+43
|\ \ \ \ \ \ \
| * | | | | | | Check whether the current attribute being write is aliased or not before writingPrathamesh Sonpatki2016-12-093-2/+20
| * | | | | | | Check whether the current attribute being read is aliased or not before readingPrathamesh Sonpatki2016-12-083-2/+24
* | | | | | | | Make Yarn the default, drop default vendor/asset directories (#27300)David Heinemeier Hansson2016-12-0811-111/+34
|/ / / / / / /
* | | | | | | Merge pull request #27278 from kamipo/should_be_sync_primary_key_definitionSean Griffin2016-12-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Should be sync the `primary_key` definition with actually createdRyuta Kamizono2016-12-061-1/+1
* | | | | | | | Add some documentation around internal APIs [ci skip]Sean Griffin2016-12-081-0/+22
* | | | | | | | Merge pull request #27185 from kamipo/fix_apply_seconds_precisionSean Griffin2016-12-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix `apply_seconds_precision` not to be affected by `mathn`Ryuta Kamizono2016-11-271-1/+1
* | | | | | | | | Merge pull request #27289 from matthewd/fixture-file-moduleMatthew Draper2016-12-082-18/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Only move fixture_file_upload to IntegrationTestMatthew Draper2016-12-072-18/+22
* | | | | | | | | | Merge pull request #27271 from printercu/permantent_digest_in_testsMatthew Draper2016-12-082-1/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed usage of cache_template_loadingMax Melentiev2016-12-062-1/+9
* | | | | | | | | | | Merge pull request #27290 from lastgabs/active-model-docsKasper Timm Hansen2016-12-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add Action View to Active Model API documentationGabi Stefanini2016-12-061-1/+1
| * | | | | | | | | | | Fixes API wording to match API conventionsGabi Stefanini2016-12-061-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #27251 from ebeigarts/fix-autosaveSean Griffin2016-12-062-3/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve test without using anonymous classesEdgars Beigarts2016-12-061-27/+24
| * | | | | | | | | | | Reload association scope inside autosaved associationsEdgars Beigarts2016-12-022-3/+30
* | | | | | | | | | | | Merge pull request #27286 from alexcameron89/document_recent_regex_changeSean Griffin2016-12-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | [ci skip] Document regex changeAlex Kitchens2016-12-061-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #27285 from MSP-Greg/MSP-Greg_doc1Matthew Draper2016-12-071-4/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | ActionCable::Connection::Base doc code sample syntax errorMSP-Greg2016-12-061-4/+1
* | | | | | | | | | | Merge pull request #25451 from kamipo/translate_not_null_violation_to_specifi...Sean Griffin2016-12-067-8/+33
|\ \ \ \ \ \ \ \ \ \ \