aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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]
| * remove deprecated `assert_send` from assertion list [ci skip]yuuji.yaginuma2016-12-091-1/+0
|/ | | | | `assert_send` was deprecated in minitest 5.10.0. Ref: https://github.com/seattlerb/minitest/commit/f95ef007ec64d956d88fedc37fd2ed7e106b777e
* 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
| | | Follow up to 0d20530e5edfd7d00fbc2a38ef5f87eca6ccc924
* 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
|\ | | | | Enable `block` variable in view
| * split DELEGATION_RESERVED_METHOD_NAMES in halfToshimaru2016-12-095-10/+17
| |
| * Enable `block` variable in viewToshimaru2016-12-093-1/+6
| | | | | | | | Remove `block` keyword from reserved method names
* | 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
| | | | | | | | | | | | | | If a Error object was serialized in the database as YAML in the Rails 4.2 version, if we load in the Rails 5.0 version it will miss the @details instance variable so methods like #clear and #add will start to fail.
* | Merge pull request #27304 from utilum/fix_test_breakerSean Griffin2016-12-081-0/+1
|\ \ | |/ |/| Fix test breaking error uninitialized constant ActiveRecord::Type::Value
| * 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 as binary
| * Extract notes from files in binaryBenjamin Fleischer2016-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Prevents: ArgumentError: invalid byte sequence in UTF-8 railties/lib/rails/source_annotation_extractor.rb:115:in `=~' railties/lib/rails/source_annotation_extractor.rb:115:in `block in extract_annotations_from' And there's no reason we need to interpret the files as UTF-8 when scanning for annotations. Applies to Rails 4.2 as well.
* | Merge pull request #26696 from iainbeeston/only-ruby-types-in-activemodelSean Griffin2016-12-0810-35/+33
|\ \ | | | | | | | | | Moved database-specific ActiveModel types into ActiveRecord
| * | Moved database-specific ActiveModel types into ActiveRecordIain Beeston2016-10-1410-34/+33
| | | | | | | | | | | | ie. DecimalWithoutScale, Text and UnsignedInteger
* | | Merge pull request #26529 from prathamesh-sonpatki/fix-alias-attribute-issueSean Griffin2016-12-084-3/+43
|\ \ \ | | | | | | | | Check whether the current attribute being read is aliased or not before reading
| * | | Check whether the current attribute being write is aliased or not before writingPrathamesh Sonpatki2016-12-093-2/+20
| | | | | | | | | | | | | | | | - If aliased, then use the aliased attribute name.
| * | | Check whether the current attribute being read is aliased or not before readingPrathamesh Sonpatki2016-12-083-2/+24
| | | | | | | | | | | | | | | | | | | | - If aliased, then use the aliased attribute name. - Fixes #26417.
* | | | 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 created
| * | | Should be sync the `primary_key` definition with actually createdRyuta Kamizono2016-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually the `primary_key` definition is not used but the inconsistency is confusing. Actual definition is `bigint auto_increment PRIMARY KEY` so `UNSIGNED` and `(8)` is unnecessary. See also #21607.
* | | | Add some documentation around internal APIs [ci skip]Sean Griffin2016-12-081-0/+22
| | | | | | | | | | | | | | | | | | | | While these method aren't public API, they are a non-trivial internal API which warrant a bit of explanation.
* | | | 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`
| * | | | Fix `apply_seconds_precision` not to be affected by `mathn`Ryuta Kamizono2016-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `apply_seconds_precision` cannnot round usec when after `require 'mathn'`. ``` irb(main):001:0> 1234 / 1000 * 1000 => 1000 irb(main):002:0> 1234 - 1234 % 1000 => 1000 irb(main):003:0> require 'mathn' => true irb(main):004:0> 1234 / 1000 * 1000 => 1234 irb(main):005:0> 1234 - 1234 % 1000 => 1000 ```
* | | | | Merge pull request #27289 from matthewd/fixture-file-moduleMatthew Draper2016-12-082-18/+22
|\ \ \ \ \ | | | | | | | | | | | | Only move fixture_file_upload to IntegrationTest
| * | | | | Only move fixture_file_upload to IntegrationTestMatthew Draper2016-12-072-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the helpers are better placed on Session -- and this is the only one that cares which class it is defined on.
* | | | | | Merge pull request #27271 from printercu/permantent_digest_in_testsMatthew Draper2016-12-082-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't clear digest cache in test environment
| * | | | | | Fixed usage of cache_template_loadingMax Melentiev2016-12-062-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It disables recompilation of templates on every request in test env.
* | | | | | | Merge pull request #27290 from lastgabs/active-model-docsKasper Timm Hansen2016-12-071-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix ActiveModel::Model API documentation [ci skip]
| * | | | | | | Add Action View to Active Model API documentationGabi Stefanini2016-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 4.1, Action View was extracted from Action Pack, but this change was not reflected in the API documentation of ActiveModel::Model. This commits makes it explicit in the documentation that Active Model also interacts with Action View as well as Action Pack. [ci skip]
| * | | | | | | Fixes API wording to match API conventionsGabi Stefanini2016-12-061-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ActiveModel::Model API documentation, referrences to Rails components were tagged with fixed-width font and named as if they were modules.This fixes the inconsistency to match API documentation conventions. [ci skip]
* | | | | | | Merge pull request #27251 from ebeigarts/fix-autosaveSean Griffin2016-12-062-3/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix association scope inside autosaved association callbacks
| * | | | | | | 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 change
| * | | | | | | [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 error
| * | | | | | | ActionCable::Connection::Base doc code sample syntax errorMSP-Greg2016-12-061-4/+1
| | | | | | | |
* | | | | | | | Merge pull request #25451 from ↵Sean Griffin2016-12-067-8/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/translate_not_null_violation_to_specific_exception Translate NOT NULL violation to the specific exception
| * | | | | | | | Translate NOT NULL violation to the specific exceptionRyuta Kamizono2016-12-067-8/+33
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise `ActiveRecord::NotNullViolation` when a record cannot be inserted or updated because it would violate a not null constraint.
* | | | | | | | Merge pull request #27275 from kamipo/should_inherit_statement_invalidSean Griffin2016-12-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Should inherit `StatementInvalid` rather than `WrappedDatabaseException`
| * | | | | | | Should inherit `StatementInvalid` rather than `WrappedDatabaseException`Ryuta Kamizono2016-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because defunct wrapper class is kept for compatibility.
* | | | | | | | Merge pull request #27280 from brchristian/patch-1Jeremy Daer2016-12-051-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Docs: correct punctuation in puma.rb
| * | | | | | | | Update puma.rbbrchristian2016-12-051-6/+6
|/ / / / / / / / | | | | | | | | | | | | | | | | Clarifying some of the language/punctuation and removing a couple comma splices.
* | | | | | | | Merge pull request #26687 from kamipo/fix_add_index_to_normalize_optionsMatthew Draper2016-12-064-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix `add_index` to normalize column names and options
| * | | | | | | | Fix `add_index` to normalize column names and optionsRyuta Kamizono2016-10-034-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently does not work the following code. ```ruby add_index(:people, ["last_name", "first_name"], order: { last_name: :desc, first_name: :asc }) ``` Normalize column names and options to fix the issue.
* | | | | | | | | Merge pull request #27277 from kamipo/remove_unnecessary_variableMatthew Draper2016-12-061-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Remove unnecessary `connection_name` variable
| * | | | | | | | Remove unnecessary `connection_name` variableRyuta Kamizono2016-12-061-2/+1
| | |/ / / / / / | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:43:08 +0000