aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Make preload query to preparableRyuta Kamizono2017-07-074-4/+4
| | | | | | | | | | | | | | Currently preload query cannot be prepared statements even if `prepared_statements: true` due to array handler in predicate builder doesn't support making bind params. This makes preload query to preparable by don't passing array value if possible.
* | Merge pull request #29840 from kamipo/fix_type_casting_time_for_mariadbSean Griffin2017-07-181-1/+0
|\ \ | | | | | | Fix type casting a time for MariaDB
| * | Fix type casting a time for MariaDBRyuta Kamizono2017-07-191-1/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context #24542. Since 8ebe1f2, it has lost stripping date part for a time value. But I confirmed it is still needed even if MariaDB 10.2.6 GA. MariaDB 10.2.6, `prepared_statements: true`: ``` % ARCONN=mysql2 be ruby -w -Itest test/cases/time_precision_test.rb -n test_formatting_time_according_to_precision Using mysql2 Run options: -n test_formatting_time_according_to_precision --seed 37614 F Failure: TimePrecisionTest#test_formatting_time_according_to_precision [test/cases/time_precision_test.rb:53]: Failed assertion, no message given. bin/rails test test/cases/time_precision_test.rb:46 Finished in 0.040279s, 24.8268 runs/s, 24.8268 assertions/s. 1 runs, 1 assertions, 1 failures, 0 errors, 0 skips ```
* | Merge pull request #29775 from yui-knk/assign_onceSean Griffin2017-07-181-2/+2
|\ \ | | | | | | Assign `content_type` only once
| * | Assign `content_type` only onceyui-knk2017-07-131-2/+2
| | |
* | | Merge pull request #29780 from MaxLap/fix_unscope_where_column_with_orSean Griffin2017-07-183-2/+34
|\ \ \ | | | | | | | | Bugfix: unscope(where: [columns]) would not remove the correct binds
| * \ \ Merge branch 'master' into fix_unscope_where_column_with_orSean Griffin2017-07-18212-582/+1480
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #29785 from ↵Sean Griffin2017-07-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cswilliams/rescue_postgres_connection_errors_on_dealloc Catch postgres connection errors when trying to dealloc
| * | | | Catch postgres connection errors when trying to dealloc the statement poolChris Williams2017-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection_active? will sometimes return true when the connection is actually dead/disconnected (see #3392 for a discussion of why this is). When this happens, a query is run on the dead connection which causes various postgres connection errors to be raised. This fix catches any such errors and ignores them. Closes #29760
* | | | | Merge pull request #29815 from posthumanism/add-except-optionSean Griffin2017-07-183-15/+440
|\ \ \ \ \ | | | | | | | | | | | | Add `except` option for ActiveJob::TestHelper methods
| * | | | | Add `except` option for ActiveJob::TestHelper methodsposthumanism2017-07-183-15/+440
| | | | | |
* | | | | | Merge pull request #29834 from ↵Sean Griffin2017-07-186-3/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_unscoping_default_scope_with_sti_association Fix unscoping `default_scope` in STI associations
| * | | | | | Fix unscoping `default_scope` for `Preloader`Ryuta Kamizono2017-07-192-1/+13
| | | | | | |
| * | | | | | Fix unscoping `default_scope` in STI associationsRyuta Kamizono2017-07-195-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 5c71000, it has lost to be able to unscope `default_scope` in STI associations. This change will use `.empty_scope?` instead of `.values.empty?` to regard as an empty scope if only have `type_condition`.
* | | | | | | Don't convert dates to strings when using prepared statements in mysqlSean Griffin2017-07-182-3/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dates are able to be natively handled by the mysql2 gem. libmysql (and the wire protocol) represent each portion of the date as an integer, which is significantly faster to encode and decode. By passing the Ruby date objects through directly, we can save a good bit of time and memory.
* | | | | | Merge pull request #29839 from kamipo/fix_typoRafael França2017-07-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo s/rause/raise/
| * | | | | | Fix typo s/rause/raise/Ryuta Kamizono2017-07-191-1/+1
|/ / / / / /
* | | | | | Remove deprecated code concerning non-attributes and `*_will_change!`Sean Griffin2017-07-184-24/+7
| | | | | |
* | | | | | Remove deprecated code concerning dirty methods in after callbacksSean Griffin2017-07-182-83/+11
| | | | | |
* | | | | | Remove incorrect commentSean Griffin2017-07-181-2/+0
|/ / / / / | | | | | | | | | | | | | | | This method needs to be protected.
* | | | | Merge pull request #29828 from kamipo/fix_using_custom_table_with_joinsRafael França2017-07-176-18/+29
|\ \ \ \ \ | | | | | | | | | | | | Fix `JoinDependency` with using a custom table
| * | | | | Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-186-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, `JoinDependency` doesn't use a custom table alias: ``` % ARCONN=sqlite3 be ruby -w -Itest test/cases/relations_test.rb -n test_using_a_custom_table_with_joins_affects_the_wheres Using sqlite3 Run options: -n test_using_a_custom_table_with_joins_affects_the_wheres --seed 14531 E Error:RelationTest#test_using_a_custom_table_with_joins_affects_the_wheres: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: posts.author_id: SELECT "omg_posts".* FROM "posts" "omg_posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" WHERE "omg_posts"."title" = ? LIMIT ? ```
* | | | | | Merge pull request #29830 from schneems/schneems/codetriage-badgeSean Griffin2017-07-171-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] CodeTriage badge
| * | | | | | [ci skip] CodeTriage badgeschneems2017-07-171-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Code Triage](https://www.codetriage.com/) is an app I've maintained for the past 4-5 years with the intent of getting people involved in open source. It sends subscribers a random open issue for them to help "triage". For Ruby projects such as "rails/rails" you can also subscribe to documentation. For example you can get a few random documented methods, or if you want to write docs, get undocumented methods. The initial approach was inspired by seeing the work of the small core team spending countless hours asking "what rails version was this in" and "can you give us an example app". The idea is to outsource these small interactions to a huge team of volunteers and let the core team focus on their work. The purpose of the badge is to give more people an easier way to start contributing to Rails. Here's what it currently looks like: [![Code Triage Badge](https://www.codetriage.com/rails/rails/badges/users.svg)](https://www.codetriage.com/rails/rails) The number is how many people are currently subscribed (a.k.a. "helpers") to the project on CodeTriage, the color is based off of the number of open issues in the project. You can see an example of this badge on another popular open source repo [Crystal](github.com/crystal-lang/crystal/). > For context to non-rails core: I also maintain sprockets (though a release hasn't happened in some time, sorry), and I have commit to Rails. I'm not some rando trying to push arbitrary links to READMEs on GitHub.
* | | | | | Merge pull request #26343 from ccutrer/runner_from_stdinSean Griffin2017-07-174-2/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | support `-` as an argument to `rails runner`
| * | | | | | support `-` as an argument to `rails runner`Cody Cutrer2017-07-174-2/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Rails 4.0, you could use `/dev/stdin` on both Linux and Mac, but with the switch to Kernel.load in Rails 4.1, this broke on Linux (you get a LoadError). Instead, explicitly detect `-` as meaning stdin, then read from stdin explicitly, instead of performing file gymnastics. This should now work on any platform uniformly. Passing a script via stdin is useful when you're sshing to a server, and the script you want to run is stored locally. You could theoretically pass the entire script on the command line, but in reality you'll run into problems with the command being too long.
* / / / / / Rename helper to force_lazy_load_hooks.Kasper Timm Hansen2017-07-171-14/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Clarifies the intent that aren't just loading the model but really caring about triggering the on_load callbacks.
* | | | | Merge pull request #29801 from kamipo/extract_null_relation_testSean Griffin2017-07-172-118/+82
|\ \ \ \ \ | | | | | | | | | | | | Extract `NullRelationTest` from `RelationTest`
| * | | | | Ensure calculation methods execute no queriesRyuta Kamizono2017-07-151-60/+14
| | | | | |
| * | | | | Extract `NullRelationTest` from `RelationTest`Ryuta Kamizono2017-07-152-118/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `test/cases/relations_test.rb` file has too much lines (2000 over). So I extracted `NullRelationTest` to the dedicated file.
* | | | | | Merge pull request #29799 from ↵Sean Griffin2017-07-171-8/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_outdated_test_scoped_responds_to_delegated_methods Remove outdated `test_scoped_responds_to_delegated_methods`
| * | | | | | Remove outdated `test_scoped_responds_to_delegated_methods`Ryuta Kamizono2017-07-151-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was added at 74ed123 to ensure `respond_to?` delegate methods to `Array` and `arel_table`. But array method delegation was removed at 9d79334 in favor of including `Enumerable`. And now `Relation` has `insert`, `update`, and `delete` methods (63480d2, 8d31c9f, d5f9173). So this delegation test is already outdated.
* | | | | | | Merge pull request #25564 from brewski/serializable_hash_fixSean Griffin2017-07-171-4/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Correctly handle frozen options for ActiveRecord::Serialization#seria…
| * | | | | | | Correctly handle frozen options for ↵Brian Abreu2016-12-092-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Serialization#serializable_hash.
* | | | | | | | Merge pull request #29757 from lugray/hash_with_indifferent_access_defaultSean Griffin2017-07-172-10/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix HashWithIndifferentAccess#default when include?(nil)
| * | | | | | | | Fix HashWithIndifferentAccess#default when include?(nil)Lisa Ugray2017-07-172-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of HashWithIndifferentAccess#default didn't distinguish `default` from `default(nil)`, which caused an incorrect result for `default` if `nil` was used as a key. Define HashWithIndifferentAccess#dig so that hackery that behaves differently from Hash#default can be removed from HashWithIndifferentAccess#default.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 05:26:00 +0000