Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add option to trigger JS framework-specific installation as part of webpack ↵ | David Heinemeier Hansson | 2016-12-12 | 2 | -2/+17 |
| | | | | setup | ||||
* | :nail_care: | Akira Matsuda | 2016-12-13 | 1 | -2/+1 |
| | |||||
* | nil, true, 1, etc. don't raise on #dup since Ruby 2.4 | Akira Matsuda | 2016-12-13 | 1 | -1/+1 |
| | | | | https://bugs.ruby-lang.org/issues/12979 | ||||
* | Keep AS::XmlMini::PARSING["decimal"].call('') returning 0 | Akira Matsuda | 2016-12-13 | 1 | -1/+11 |
| | | | | | BigDecimal('an invalid string') has changed its behavior to raise an ArgumentError since 1.3.0 https://bugs.ruby-lang.org/issues/10286 | ||||
* | Missing require "yaml" | Akira Matsuda | 2016-12-12 | 1 | -0/+1 |
| | |||||
* | Oops! | Akira Matsuda | 2016-12-12 | 1 | -1/+1 |
| | | | | namespace_ladder can be nil here | ||||
* | :nail_care: | Akira Matsuda | 2016-12-12 | 1 | -2/+2 |
| | | | | Don't expect the caller of this method to know that the return value has an extra " " | ||||
* | Merge pull request #27328 from kamipo/add_changelog_for_26687 | Eileen M. Uchitelle | 2016-12-11 | 1 | -0/+7 |
|\ | | | | | Add a changelog entry for #26687 [ci skip] | ||||
| * | Add a changelog entry for #26687 [ci skip] | Ryuta Kamizono | 2016-12-12 | 1 | -0/+7 |
|/ | |||||
* | Merge pull request #27330 from kamipo/remove_duplicated_line | Guillermo Iguaran | 2016-12-11 | 1 | -1/+0 |
|\ | | | | | Remove duplicated line | ||||
| * | Remove duplicated line | Ryuta Kamizono | 2016-12-11 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #27323 from kamipo/add_changelog_for_25227 | Matthew Draper | 2016-12-11 | 1 | -0/+4 |
|\ | | | | | Add a changelog entry for #25227 [ci skip] | ||||
| * | Add a changelog entry for #25227 [ci skip] | Ryuta Kamizono | 2016-12-10 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #27322 from kamipo/fix_ci_failure | Matthew Draper | 2016-12-11 | 2 | -2/+2 |
|\ \ | |/ |/| | Fix CI failure caused by #25227 and #25280 were merged at the same time | ||||
| * | Fix CI failure caused by #25227 and #25280 were merged at the same time | Ryuta Kamizono | 2016-12-10 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #25280 from ↵ | Sean Griffin | 2016-12-10 | 2 | -0/+16 |
|\ | | | | | | | | | kamipo/prevent_range_error_for_belongs_to_associations Prevent `RangeError` for `belongs_to` associations | ||||
| * | Prevent `RangeError` for `belongs_to` associations | Ryuta Kamizono | 2016-10-10 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | Currently to access `belongs_to` associations raises a `RangeError` if foreign key attribute has out of range value. It should return a nil value rather than raising a `RangeError`. Fixes #20140. | ||||
* | | Merge pull request #25227 from kamipo/numeric_value_out_of_range | Sean Griffin | 2016-12-10 | 7 | -8/+26 |
|\ \ | | | | | | | Translate numeric value out of range to the specific exception | ||||
| * | | Translate numeric value out of range to the specific exception | Ryuta Kamizono | 2016-12-06 | 7 | -8/+26 |
| | | | | | | | | | | | | Raise `ActiveRecord::RangeError` when values that executed are out of range. | ||||
* | | | Merge pull request #27320 from ↵ | Matthew Draper | 2016-12-10 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | y-yagi/run_webpack_command_only_when_webpack_option_is_specified run `webpack` command only when webpack option is specified | ||||
| * | | | run `webpack` command only when webpack option is specified | yuuji.yaginuma | 2016-12-10 | 1 | -1/+1 |
|/ / / | |||||
* | | | gemfile entry method need to return an empty array rather than nil (#27318) | Yuji Yaginuma | 2016-12-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following error when executing rails new command. ``` (erb):9:in `block in template': undefined method `comment' for nil:NilClass (NoMethodError) ``` Follow up to #27288 | ||||
* | | | Use GitHub webpacker until closer to release | David Heinemeier Hansson | 2016-12-09 | 1 | -1/+1 |
| | | | |||||
* | | | 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] | ||||
| * | | | 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 |
|/ / / | | | | | | | | | | | | | When content type header is blank we were raising an exception because `empty?` was being called on nil. | ||||
* | | | Merge pull request #27248 from stefanmb/master | Sean Griffin | 2016-12-09 | 4 | -5/+67 |
|\ \ \ | | | | | | | | | Idempotent option for after_commit :destroy callback | ||||
| * | | | Emulate db trigger behaviour for after_commit :destroy, :update | Stefan Budeanu | 2016-12-09 | 4 | -5/+67 |
|/ / / | | | | | | | | | | | | | | | | Race conditions can occur when an ActiveRecord is destroyed twice or destroyed and updated. The callbacks should only be triggered once, similar to a SQL database trigger. | ||||
* | | | 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] | ||||
| * | | | remove deprecated `assert_send` from assertion list [ci skip] | yuuji.yaginuma | 2016-12-09 | 1 | -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 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 |
| | | | | | | | | | Follow up to 0d20530e5edfd7d00fbc2a38ef5f87eca6ccc924 | ||||
* | | | 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 |
|\ \ \ | | | | | | | | | Enable `block` variable in view | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | Remove `block` keyword from reserved method names | ||||
* | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_breaker | Sean Griffin | 2016-12-08 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix test breaking error uninitialized constant ActiveRecord::Type::Value | ||||
| * | | | 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 as binary | ||||
| * | | | Extract notes from files in binary | Benjamin Fleischer | 2016-09-05 | 1 | -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-activemodel | Sean Griffin | 2016-12-08 | 10 | -35/+33 |
|\ \ \ \ | | | | | | | | | | | | | | | | Moved database-specific ActiveModel types into ActiveRecord | ||||
| * | | | | Moved database-specific ActiveModel types into ActiveRecord | Iain Beeston | 2016-10-14 | 10 | -34/+33 |
| | | | | | | | | | | | | | | | | | | | | ie. DecimalWithoutScale, Text and UnsignedInteger | ||||
* | | | | | 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 read is aliased or not before reading | ||||
| * | | | | | Check whether the current attribute being write is aliased or not before writing | Prathamesh Sonpatki | 2016-12-09 | 3 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | - If aliased, then use the aliased attribute name. | ||||
| * | | | | | Check whether the current attribute being read is aliased or not before reading | Prathamesh Sonpatki | 2016-12-08 | 3 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If aliased, then use the aliased attribute name. - Fixes #26417. |