aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not show URL in boot info when using Pumayuuji.yaginuma2017-07-241-2/+6
| | | | | | | | | | | Puma has its own configuration file(e.g. `config/puma.rb`). Can define a port and a URL to bind in the configuration file. Therefore, on Rails side, can not grasp which URI to bind finally. Because of that, it may show a URL different from the actually bound URL, so I think that it is better not to show it. Fixes #29880
* Merge pull request #29901 from kirs/actioncable-frozen-friendlySean Griffin2017-07-231-1/+5
|\ | | | | Make actioncable ready for frozen strings
| * Make actioncable ready for frozen stringsKir Shatrov2017-07-231-1/+5
| |
* | Merge pull request #29896 from kirs/frozen-actionmailerRichard Schneeman2017-07-2343-0/+84
|\ \ | |/ |/| Use frozen string literal in actionmailer/
| * Use frozen string literal in actionmailer/Kir Shatrov2017-07-2343-0/+84
|/
* Merge branch 'verify-release'Kasper Timm Hansen2017-07-234-96/+138
|\
| * Update release instructions in light of new tasks.Kasper Timm Hansen2017-07-221-44/+46
| |
| * Support multiple versions in release announcement.Kasper Timm Hansen2017-07-222-51/+67
| | | | | | | | | | So releasing 5.1 and 5.0 together won't require manual copy and paste.
| * Add task to verify a release.Kasper Timm Hansen2017-07-222-1/+25
| | | | | | | | | | | | | | | | Basically revises the release flow to: * Update the version in RAILS_VERSION + rake changelog:header * Run rake all:verify (click around in the booted app) * If that checks out, run rake release.
* | Merge pull request #29867 from koic/fix_a_failed_ar_test_when_using_oracleKasper Timm Hansen2017-07-231-2/+10
|\ \ | | | | | | Fix a failued AR test when using OracleAdapter
| * | Fix a failued AR test when using OracleAdapterKoichi ITO2017-07-201-2/+10
| | |
* | | Let Metadata instance handle purpose coercion.Kasper Timm Hansen2017-07-231-4/+4
| | | | | | | | | | | | [ Assain Jaleel & Kasper Timm Hansen ]
* | | Remove dependency on `from_now` extension.Kasper Timm Hansen2017-07-231-1/+1
| | | | | | | | | | | | [ Assain Jaleel & Kasper Timm Hansen ]
* | | Merge pull request #29768 from janpieper/sort-enabled-extensions-in-dumpEileen M. Uchitelle2017-07-222-1/+15
|\ \ \ | |_|/ |/| | Sort enabled adapter extensions in schema dump
| * | Sort enabled adapter extensions in schema dumpJan Pieper2017-07-122-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | The list of enabled adapter extensions in the schema dump isn't sorted by default, so it may happen that the sorting changes over time. If you're using a VCS, a change to the sorting results in a diff without any real change. Sorting the list should solve this problem.
* | | Merge pull request #29870 from kamipo/use_true_false_literalsSean Griffin2017-07-222-14/+4
|\ \ \ | | | | | | | | Use `TRUE` and `FALSE` boolean literals for MySQL
| * | | Use `TRUE` and `FALSE` boolean literals for MySQLRyuta Kamizono2017-07-202-14/+6
| | |/ | |/| | | | | | | | | | | | | Since #29699, abstract boolean serialization has been changed to use `TRUE` and `FALSE` literals. MySQL also support the literals. So we can use the abstract boolean serialization even for MySQL.
* | | Merge pull request #29858 from ↵Rafael França2017-07-212-19/+18
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/use_argument_error_instead_of_own_error_class Use `ArgumentError` instead of own error class
| * | | Use `ArgumentError` instead of own error classyuuji.yaginuma2017-07-202-19/+18
| |/ / | | | | | | | | | | | | If the argument is invalid, I think that it is more intuitive to use `ArgumentError` than its own error class.
* | | Merge pull request #29869 from kamipo/make_type_map_to_privateRafael França2017-07-219-31/+28
|\ \ \ | | | | | | | | Make `type_map` to private because it is only used in the connection adapter
| * | | Make `type_map` to private because it is only used in the connection adapterRyuta Kamizono2017-07-209-31/+28
| |/ / | | | | | | | | | | | | | | | | | | `type_map` is an internal API and it is only used in the connection adapter. And also, some type map initializer methods requires passed `type_map`, but those instances already has `type_map` in itself. So we don't need explicit passing `type_map` to the initializers.
* | | Merge pull request #29884 from padi/update_rails_5_upgrade_guideRafael França2017-07-212-2/+12
|\ \ \ | | | | | | | | Updates Rails upgrade guide on `ActionView::Helpers::RecordTagHelper`
| * | | Suppress documentation for content_tag_for and div_for since they were ↵Marc Rendl Ignacio2017-07-211-2/+2
| | | | | | | | | | | | | | | | removed already
| * | | Updates Rails upgrade guide for 4.2 to 5.0 regarding the removal of ↵Marc Rendl Ignacio2017-07-211-0/+10
| | |/ | |/| | | | | | | `ActionView::Helpers::RecordTagHelper`
* | | Merge pull request #29885 from freeletics/fix-false-positive-testRafael França2017-07-211-11/+11
|\ \ \ | | | | | | | | Fix false positive test related to wrong app root path.
| * | | Fix false positive test related to wrong app root path.Wojciech Wnętrzak2017-07-211-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Without setting root config, `config.paths["config/secrets"]` located in https://github.com/rails/rails/blob/84eb498f84ebc5d1be0b0db6f7bca9da3d679ca6/railties/lib/rails/application.rb#L390 always returned empty list.
* | | | Merge pull request #29855 from lugray/has_one_destroyed_by_associationRafael França2017-07-213-0/+42
|\ \ \ \ | | | | | | | | | | Match destroyed_by_association for has_one to has_many
| * | | | Match destroyed_by_association for has_one to has_manyLisa Ugray2017-07-213-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a has_many association is destroyed by `dependent: destroy`, destroyed_by_association is set to the reflection, and this can be checked in callbacks. This matches that behaviour for has_one associations.
* | | | | Merge pull request #29732 from kirs/frozen-activerecordRafael França2017-07-21678-11/+1367
|\ \ \ \ \ | | | | | | | | | | | | Use frozen-string-literal in ActiveRecord
| * | | | | Reset column information after schema changedyuuji.yaginuma2017-07-202-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following failures. https://travis-ci.org/rails/rails/jobs/253990014
| * | | | | Use frozen-string-literal in ActiveRecordKir Shatrov2017-07-19677-11/+1363
| | |_|_|/ | |/| | |
* | | | | Revert "Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`"Sean Griffin2017-07-2113-46/+56
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6ad4052d18e4b29b8a092526c2beef013e2bf4f. This is not something that the majority of Active Record should be testing or care about. We should look at having fewer places rely on these details, not make it easier to rely on them.
* | | | Merge pull request #29882 from y-yagi/fix_ujs_test_postprocessingKasper Timm Hansen2017-07-211-1/+1
|\ \ \ \ | | | | | | | | | | Remove log directory in test postprocessing
| * | | | Remove log directory in test postprocessingyuuji.yaginuma2017-07-211-1/+1
|/ / / / | | | | | | | | | | | | The "log" is directory. So it is necessary to use `FileUtils.rm_rf`.
* | | | Merge pull request #29872 from padi/add_jquery_vendor_for_ujs_testingGuillermo Iguaran2017-07-202-1/+9832
|\ \ \ \ | | | | | | | | | | Add jQuery to test/ujs/vendor files for testing rails-ujs
| * | | | Add jQuery to test vendor filesMarc Rendl Ignacio2017-07-202-1/+9832
| |/ / / | | | | | | | | | | | | | | | | ... so that we can run most, if not all, of rails-ujs tests without necessarily requiring an internet connection.
* | | | Merge pull request #29851 from printercu/patch-1Eileen M. Uchitelle2017-07-201-1/+1
|\ \ \ \ | |/ / / |/| | | Make `rails yarn:install` ignore dev dependencies
| * | | Make `rails yarn:install` ignore dev dependenciesprintercu2017-07-191-1/+1
| |/ /
* | | Merge pull request #29854 from assain/add_metadata_to_message_verifierKasper Timm Hansen2017-07-192-6/+48
|\ \ \ | | | | | | | | Add Expiry & Purpose to Message Verifier
| * | | add metadata support to message verifierAssain2017-07-192-6/+48
|/ / /
* / / Move back to @matthewd's close io fixed rb-inotify.Kasper Timm Hansen2017-07-192-2/+13
|/ /
* | Merge pull request #29599 from assain/add_meta_data_to_message_encryptorKasper Timm Hansen2017-07-194-6/+192
|\ \ | | | | | | Add purpose and expiry to messages encrypted using Message Encryptor
| * | Add expires_at, expires_in, and purpose meta_data to messages.Assain2017-07-194-6/+192
|/ /
* | Merge pull request #29843 from y-yagi/fix_ruby_warningsKasper Timm Hansen2017-07-191-2/+2
|\ \ | | | | | | Fix `warning: circular argument reference`
| * | Fix `warning: circular argument reference`yuuji.yaginuma2017-07-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warnings: ``` rails/activejob/lib/active_job/test_helper.rb:119: warning: circular argument reference - except rails/activejob/lib/active_job/test_helper.rb:166: warning: circular argument reference - except ```
* | | Merge pull request #29844 from kamipo/create_rails_user_on_travis_ciKasper Timm Hansen2017-07-191-0/+4
|\ \ \ | | | | | | | | Create `rails@localhost` user on travis ci
| * | | Create `rails@localhost` user on travis ciRyuta Kamizono2017-07-191-0/+4
| |/ / | | | | | | | | | | | | | | | | | | Looks like that latest CI failure is due to missing `rails@localhost`. Creating the user may solve the issue. https://travis-ci.org/rails/rails/jobs/254996063#L831
* | | Merge pull request #29845 from willnet/doc-rails-ujsGuillermo Iguaran2017-07-181-1/+1
|\ \ \ | |/ / |/| | [ci skip]Replace jquery-ujs with rails-ujs
| * | [ci skip]Replace jquery-ujs with rails-ujswillnet2017-07-191-1/+1
|/ /
* | Merge pull request #29033 from kamipo/make_preload_query_to_prepared_statementsSean Griffin2017-07-184-4/+4
|\ \ | | | | | | Make preload query to preparable
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 07:13:11 +0000