aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #27945 from betesh/allow-frozen-hashes-to-as_jsonRafael Mendonça França2017-02-083-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow ActiveRecord::Base.as_json to accept a frozen Hash
| * | | | | | | Allow ActiveRecord::Base.as_json to accept a frozen HashIsaac Betesh2017-02-083-1/+16
| | | | | | | |
* | | | | | | | Merge pull request #27935 from namusyaka/fix-hidden-primary_keyRafael França2017-02-085-1/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix inspection behavior when the :id column is not primary key
| * | | | | | | Fix inspection behavior when the :id column is not primary keynamusyaka2017-02-095-1/+18
|/ / / / / / /
* | | | | | | Merge pull request #27940 from ↵Rafael França2017-02-087-23/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/deprecate_halt_callback_chains_on_return_false deprecate `halt_callback_chains_on_return_false` instead of `halt_and_display_warning_on_return_false`
| * | | | | | | remove `ActiveSupport.halt_callback_chains_on_return_false` from everywhereyuuji.yaginuma2017-02-084-7/+0
| | | | | | | |
| * | | | | | | deprecate `halt_callback_chains_on_return_false` instead of ↵yuuji.yaginuma2017-02-083-16/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `halt_and_display_warning_on_return_false` `halt_and_display_warning_on_return_false` is not a public API and application is using `halt_callback_chains_on_return_false`. https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt#L29 https://github.com/rails/rails/blob/5-0-stable/activesupport/lib/active_support.rb#L86..L88 Therefore, deprecate messages should be issued for `halt_callback_chains_on_return_false` instead of `halt_and_display_warning_on_return_false`.
* | | | | | | Merge pull request #27938 from y-yagi/remove_link_to_edgeapiJon Moss2017-02-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove link to edgeapi [ci skip]
| * | | | | | | remove link to edgeapi [ci skip]yuuji.yaginuma2017-02-081-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #27232 from robin850/guides-linkingXavier Noria2017-02-072-2/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve linking inside guides
| * | | | | | | Automatically link to Ruby files referenced in notes [ci skip]Robin Dupret2017-02-071-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ease reading the "Active Support Core Extensions" guide, let's automatically link references to Ruby files. It's also possible to reference other components' files in the even though it's not used in the guides at the moment. [Petr Skocik & Robin Dupret]
| * | | | | | | Automatically inject the current Rails version in API links [ci skip]Robin Dupret2017-02-072-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure that the user won't look at a feature that doesn't already exist if they are looking at a previous version of the guides, let's automatically inject the Rails version the guides have been generated against.
* | | | | | | | Remove unused code now that the deprecated file was removedRafael Mendonça França2017-02-071-2/+1
| | | | | | | |
* | | | | | | | Merge pull request #25873 from schuetzm/warn_about_dirty_lockRafael Mendonça França2017-02-073-2/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate locking of dirty records
| * | | | | | | | Deprecate locking of dirty recordsMarc Schütz2017-02-073-2/+18
| | | | | | | | |
* | | | | | | | | Deprecate halt_and_display_warning_on_return_falseRafael Mendonça França2017-02-072-5/+16
| | | | | | | | |
* | | | | | | | | Remove deprecated behavior that halts callbacks when the return is falseRafael Mendonça França2017-02-0712-188/+24
| | | | | | | | |
* | | | | | | | | Document that string in if and unless option of callbacks are deprecatedRafael Mendonça França2017-02-071-4/+4
| | | | | | | | |
* | | | | | | | | Improve the exception message to direct people to all the possible valuesRafael Mendonça França2017-02-071-1/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #27608 from ↵Rafael França2017-02-077-116/+99
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_deprecated_passing_string_to_define_callback Remove deprecated passing string to define callback
| * | | | | | | | Deprecate passing string to `:if` and `:unless` conditional options on ↵Ryuta Kamizono2017-02-045-14/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `set_callback` and `skip_callback`
| * | | | | | | | Remove deprecated passing string to define callbackRyuta Kamizono2017-02-045-103/+32
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | And raise `ArgumentError` when passing string to define callback.
* | | | | | | | Merge pull request #27933 from kamipo/revert_27682Jeremy Daer2017-02-072-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Revert "Remove useless `column_alias` in `subquery_for_count`"
| * | | | | | | | Revert "Remove useless `column_alias` in `subquery_for_count`"Ryuta Kamizono2017-02-072-3/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28977f1fa3d7b15c1608174a165e60b71ddf3995.
* | | | | | | | Merge pull request #27334 from ↵Jeremy Daer2017-02-0712-31/+79
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/pk_and_ref_columns_should_be_identical_type `primary_key` and `references` columns should be identical type
| * | | | | | | | `primary_key` and `references` columns should be identical typeRyuta Kamizono2017-02-0712-31/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #26266. The default type of `primary_key` and `references` were changed to `bigint` since #26266. But legacy migration and sqlite3 adapter should keep its previous behavior.
* | | | | | | | | Merge pull request #27922 from martijn/reduce-actioncable-loggingJeremy Daer2017-02-072-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Move some ActionCable logs to debug level
| * | | | | | | | | Move some ActionCable logs to debug levelMartijn Storck2017-02-062-2/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #26378 from ↵Jeremy Daer2017-02-064-41/+51
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/decouple_building_arel_ast_for_uniqueness_validator Decouple the building Arel ASTs for uniqueness validator
| * | | | | | | | | Add `:nodoc:` to `case_sensitive_comparison` and `case_insensitive_comparison`Ryuta Kamizono2017-01-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods are obviously for internal use.
| * | | | | | | | | Decouple the building Arel ASTs for uniqueness validatorRyuta Kamizono2016-12-254-38/+48
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently uniqueness validator is coupled with building Arel ASTs. This commit extracts `WhereClauseFactory#build_for_case_sensitive` for decouple the building Arel ASTs.
* | | | | | | | | Remove useless `column_alias` in `subquery_for_count`Ryuta Kamizono2017-02-062-5/+5
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If select clause is specified and last column has a column alias, additional column alias causes a statement invalid. Add test coverage for counting a single column with NULL values. Fixes #27676, #27682, and #27705.
* | | | | | | | Merge pull request #27389 from kamipo/fix_mysql_pk_dumping_correctlyJeremy Daer2017-02-0611-236/+191
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the behaviour of the compatibility layer for integer-like PKs * kamipo/fix_mysql_pk_dumping_correctly: Restore custom primary key tests lost at #26266 Restore the behaviour of the compatibility layer for integer-like PKs Correctly dump integer-like primary key with default nil
| * | | | | | | | Restore custom primary key tests lost at #26266Ryuta Kamizono2017-02-041-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some custom primary key tests (added at #17631, #17696, #18220, #18228) were lost at #26266. Restore the tests to improve test coverage.
| * | | | | | | | Restore the behaviour of the compatibility layer for integer-like PKsRyuta Kamizono2017-02-046-174/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PR #27384 changed migration compatibility behaviour. ```ruby class CreateMasterData < ActiveRecord::Migration[5.0] def change create_table :master_data, id: :integer do |t| t.string :name end end end ``` Previously this migration created non-autoincremental primary key expected. But after the PR, the primary key changed to autoincremental, it is unexpected. This change restores the behaviour of the compatibility layer.
| * | | | | | | | Correctly dump integer-like primary key with default nilRyuta Kamizono2017-02-045-40/+40
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PR #27384 changed integer-like primary key to be autoincrement unless an explicit default. This means that integer-like primary key is restored as autoincrement unless dumping the default nil explicitly. We should dump integer-like primary key with default nil correctly.
* | | | | | | | Merge pull request #27884 from kamipo/deprecate_migration_keysJeremy Daer2017-02-067-6/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Deprecate `ColumnDumper#migration_keys`
| * | | | | | | | Deprecate `ColumnDumper#migration_keys`Ryuta Kamizono2017-02-077-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ColumnDumper#migration_keys` was extracted to customize keys for standardized column arguments widths. But the feature was removed in df84e98. The internal method is no longer used for that.
* | | | | | | | | Merge pull request #27929 from kamipo/remove_useless_mysql_column_testsJeremy Daer2017-02-061-42/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Remove superfluous `MySQL::Column` tests
| * | | | | | | | Remove useless `MySQL::Column` testsRyuta Kamizono2017-02-071-42/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since text default treated as an empty string in non-strict mode has been removed in #26154, `MySQL::Column` behaves like any other column. Also, The difference between strict and non-strict mode is covered by `test_mysql_not_null_defaults_strict` and `test_mysql_not_null_defaults_non_strict`.
* | | | | | | | Merge pull request #27928 from y-yagi/remove_activemodel_testcase_from_libRafael França2017-02-064-6/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove `ActiveModel::TestCase` from lib
| * | | | | | | | Remove `ActiveModel::TestCase` from libyuuji.yaginuma2017-02-074-6/+5
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveModel::TestCase` is used only for the test of Active Model. Also, it is a private API and can not be used in applications. Therefore, it is not necessary to include it in lib.
* | | | | | | | Merge pull request #27919 from bf4/correct_spellingArthur Nogueira Neves2017-02-0621-29/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correct spelling
| * | | | | | | | Correct spellingBenjamin Fleischer2017-02-0521-29/+29
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` go get -u github.com/client9/misspell/cmd/misspell misspell -w -error -source=text . ```
* | | | | | | | Merge pull request #27924 from kenta-s/add-test-for-datetime-blankRafael França2017-02-063-0/+12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Add test for DateTime#blank?
| * | | | | | | Add tests for `blank?`kenta-s2017-02-063-0/+12
|/ / / / / / /
* | | | | | | Merge pull request #27902 from kirs/yaml-column-errorKasper Timm Hansen2017-02-064-10/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Indicate action that failed in YamlColumn
| * | | | | | Indicate action that failed in YamlColumnKir Shatrov2017-02-054-10/+10
| |/ / / / /
* | | | | | Merge pull request #27900 from y-yagi/add_arg_key_to_process_action_mailer_eventKasper Timm Hansen2017-02-053-1/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `:args` to `process.action_mailer` event.
| * | | | | | Add `:args` to `process.action_mailer` eventyuuji.yaginuma2017-02-043-1/+25
| |/ / / / /