aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #27954 from maclover7/jm-fix-26404Jon Moss2017-02-091-0/+10
|\
| * Add note about breakage in file uploads in controller tests to upgradingJon Moss2017-02-091-0/+10
* | Simplify and speed up Postgres query for primary_keysJordan Lewis2017-02-092-10/+17
* | Merge pull request #27952 from dijonkitchen/patch-1Eileen M. Uchitelle2017-02-091-1/+1
|\ \
| * | Fix wordingJonathan Chen2017-02-091-1/+1
|/ /
* | Refactor `ColumnDefinition` to contain `options` hashRyuta Kamizono2017-02-0915-128/+59
* | 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 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 keynamusyaka2017-02-095-1/+18
|/ /
* | Merge pull request #27940 from y-yagi/deprecate_halt_callback_chains_on_retur...Rafael França2017-02-087-23/+7
|\ \
| * | remove `ActiveSupport.halt_callback_chains_on_return_false` from everywhereyuuji.yaginuma2017-02-084-7/+0
| * | deprecate `halt_callback_chains_on_return_false` instead of `halt_and_display...yuuji.yaginuma2017-02-083-16/+7
|/ /
* | Merge pull request #27938 from y-yagi/remove_link_to_edgeapiJon Moss2017-02-071-1/+1
|\ \
| * | 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
|\ \
| * | Automatically link to Ruby files referenced in notes [ci skip]Robin Dupret2017-02-071-1/+19
| * | Automatically inject the current Rails version in API links [ci skip]Robin Dupret2017-02-072-1/+24
* | | 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 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 kamipo/remove_deprecated_passing_string_to_def...Rafael França2017-02-077-116/+99
|\ \ \ \ | |/ / / |/| | |
| * | | Deprecate passing string to `:if` and `:unless` conditional options on `set_c...Ryuta Kamizono2017-02-045-14/+68
| * | | Remove deprecated passing string to define callbackRyuta Kamizono2017-02-045-103/+32
* | | | Merge pull request #27933 from kamipo/revert_27682Jeremy Daer2017-02-072-3/+3
|\ \ \ \
| * | | | Revert "Remove useless `column_alias` in `subquery_for_count`"Ryuta Kamizono2017-02-072-3/+3
|/ / / /
* | | | Merge pull request #27334 from kamipo/pk_and_ref_columns_should_be_identical_...Jeremy Daer2017-02-0712-31/+79
|\ \ \ \
| * | | | `primary_key` and `references` columns should be identical typeRyuta Kamizono2017-02-0712-31/+79
* | | | | Merge pull request #27922 from martijn/reduce-actioncable-loggingJeremy Daer2017-02-072-2/+2
|\ \ \ \ \
| * | | | | Move some ActionCable logs to debug levelMartijn Storck2017-02-062-2/+2
* | | | | | Merge pull request #26378 from kamipo/decouple_building_arel_ast_for_uniquene...Jeremy Daer2017-02-064-41/+51
|\ \ \ \ \ \
| * | | | | | Add `:nodoc:` to `case_sensitive_comparison` and `case_insensitive_comparison`Ryuta Kamizono2017-01-202-3/+3
| * | | | | | Decouple the building Arel ASTs for uniqueness validatorRyuta Kamizono2016-12-254-38/+48
* | | | | | | Remove useless `column_alias` in `subquery_for_count`Ryuta Kamizono2017-02-062-5/+5
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #27389 from kamipo/fix_mysql_pk_dumping_correctlyJeremy Daer2017-02-0611-236/+191
|\ \ \ \ \ \
| * | | | | | Restore custom primary key tests lost at #26266Ryuta Kamizono2017-02-041-25/+43
| * | | | | | Restore the behaviour of the compatibility layer for integer-like PKsRyuta Kamizono2017-02-046-174/+111
| * | | | | | Correctly dump integer-like primary key with default nilRyuta Kamizono2017-02-045-40/+40
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #27884 from kamipo/deprecate_migration_keysJeremy Daer2017-02-067-6/+18
|\ \ \ \ \ \
| * | | | | | Deprecate `ColumnDumper#migration_keys`Ryuta Kamizono2017-02-077-6/+18
* | | | | | | Merge pull request #27929 from kamipo/remove_useless_mysql_column_testsJeremy Daer2017-02-061-42/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove useless `MySQL::Column` testsRyuta Kamizono2017-02-071-42/+0
|/ / / / / /
* | | | | | Merge pull request #27928 from y-yagi/remove_activemodel_testcase_from_libRafael França2017-02-064-6/+5
|\ \ \ \ \ \
| * | | | | | Remove `ActiveModel::TestCase` from libyuuji.yaginuma2017-02-074-6/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #27919 from bf4/correct_spellingArthur Nogueira Neves2017-02-0621-29/+29
|\ \ \ \ \ \
| * | | | | | Correct spellingBenjamin Fleischer2017-02-0521-29/+29
| |/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 12:51:41 +0000