aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Correctly return `associated_table` when `associated_with?` is trueRyuta Kamizono2016-07-104-3/+20
| | | | | | | `AssociationQueryHandler` requires `association` initialized `TableMetadata` even if `table_name == arel_table.name`. Fixes #25689.
* Merge pull request #25759 from prathamesh-sonpatki/changelog-cleanupsRafael França2016-07-092-8/+12
|\ | | | | Cleanup CHANGELOGs [ci skip]
| * Cleanup CHANGELOGs [ci skip]Prathamesh Sonpatki2016-07-092-8/+12
| | | | | | | | | | | | - Cleanup Active Record CHANGELOG. - Add missing CHANGELOG for https://github.com/rails/rails/pull/25688. - Clarify that assets requests logging is suppressed.
* | Merge pull request #25766 from vipulnsward/fix-ac-tests-2-4Rafael França2016-07-091-1/+1
|\ \ | |/ |/| Fix AJ tests on ruby 2.4 being caused since classes are unified for Integer
| * Fix AJ tests on ruby 2.4 being causes since classes are unified for Integer, ↵Vipul A M2016-07-091-1/+1
| | | | | | | | and we create test name nased on arg class. Append ar as well to the test name
* | Merge pull request #23636 from rab/fix-to_param-truncationMatthew Draper2016-07-093-4/+41
|\ \ | | | | | | fix to_param to maximize content
| * | fix to_param to maximize contentRob Biedenharn2016-07-083-4/+41
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation states that parameter values longer than 20 characters will be truncated by words, but the example shows that a parameter based on "David Heinemeier Hansson" (with id: 125) becomes "125-david" when "David Heinemeier".length == 16 so why so short? The answer lies in the use of the #truncate option omission: nil which seems to have been intended to mean "nothing", but which actually causes the default string "..." to be used. This causes #truncate to cleave words until the "..." can be added and still remain within the requested size of 20 characters. The better option is omission: '' (which is probably what was originally intended). Furthermore, since the use of #parameterize will remove non-alphanumeric characters, we can maximize the useful content of the output by calling parameterize first and then giving truncate a separator: /-/ rather than a space.
* | Merge pull request #25652 from prathamesh-sonpatki/rm-boot-railsGuillermo Iguaran2016-07-0838-46/+3
|\ \ | | | | | | Remove unused boot_rails method and it's usage
| * | Remove unused boot_rails method and it's usagePrathamesh Sonpatki2016-07-0438-46/+3
| | | | | | | | | | | | | | | - The `boot_rails` method from abstract_unit.rb is empty after 2abcdfd978fdcd491576a237e8c6b. - So let's remove it and its usage.
* | | Merge pull request #25688 from mahnunchik/host-env-varGuillermo Iguaran2016-07-082-0/+8
|\ \ \ | | | | | | | | Use the HOST environment variable for rails server #25677
| * | | Use the HOST environment variable for rails server #25677Evgeny Vlasenko2016-07-052-0/+8
| | | |
* | | | Correct changelog layoutMatthew Draper2016-07-091-8/+8
| | | | | | | | | | | | | | | | [ci skip]
* | | | Insert changelog entry for #25615Matthew Draper2016-07-091-0/+7
| | | |
* | | | Merge pull request #25624 from tinco/actioncable_write_raceMatthew Draper2016-07-092-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | Fix race condition in websocket stream write
| * | | | fix race condition in websocket stream writeTinco Andringa2016-07-011-0/+4
| | | | |
* | | | | Merge pull request #25714 from robin850/changelog-25692Rafael Mendonça França2016-07-071-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add a changelog entry for #25692
| * | | | | Add a changelog entry for #25692 [ci skip]Robin Dupret2016-07-061-0/+6
| | | | | |
* | | | | | Merge pull request #25745 from alexcameron89/schema_statementsVipul A M2016-07-071-12/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | [ci skip] Update documentation in AR SchemaStatements
| * | | | | [ci skip] Update documentation in AR SchemaStatementsAlex Kitchens2016-07-071-12/+12
|/ / / / / | | | | | | | | | | | | | | | This includes minor grammar fixes throughout the file.
* | | | | Merge pull request #25730 from prathamesh-sonpatki/rm-cookie-onlyRafael França2016-07-072-1/+7
|\ \ \ \ \ | | | | | | | | | | | | No need to set `cookie_only` option from Rails
| * | | | | Add a test case for verifying `cookie_only` is set even if user tries to set ↵Prathamesh Sonpatki2016-07-072-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | it false
* | | | | | Merge pull request #25743 from abhishekjain16/small_fixRafael França2016-07-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in test case
| * | | | | | Fix typo in test caseAbhishek Jain2016-07-081-1/+1
|/ / / / / /
* | | | | | Merge pull request #25736 from voxik/file-store-test-require-pathnameRafael França2016-07-071-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Pathname might not be always initialized.
| * | | | | | Pathname might not be always initialized.Vít Ondruch2016-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Require 'pathname' explicitly
* | | | | | | Merge pull request #25731 from chen7897499/fix_typoYves Senn2016-07-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo: caches_pages to caches_page. [ci skip]
| * | | | | | | Fix typo: caches_pages to caches_page.chen78974992016-07-071-1/+1
|/ / / / / / / | | | | | | | | | | | | | | Fix a small typo on doc: "caches_pages" -> "caches_page".
* | | | | | | Merge pull request #25691 from y-yagi/test_with_latest_rescueRafael França2016-07-072-8/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | test with latest resque
| * | | | | | | test with latest resqueyuuji.yaginuma2016-07-052-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When run test of Active Job with resque 1.26, occurs following error. ``` QueuingTest#test_current_locale_is_kept_while_running_perform_later: NoMethodError: undefined method `current_tags' for #<Resque::QuietFormatter:0x0055b44f63ed50> /home/yaginuma/program/rails/master_y_yagi/rails/activejob/lib/active_job/logging.rb:51:in `logger_tagged_by_active_job?' ``` This was happening for the formatter class of resque not the formatter class of Rails is they've been used to logger.formatter. This was happening because become fomatter is changed during the instantiation of worker in the resque 1.26. In the master, unless the environment variable is set, fomatter is so as not to be changed, test will pass. Ref: https://github.com/resque/resque/pull/1439
* | | | | | | | Merge pull request #25707 from matthewd/double-reapMatthew Draper2016-07-074-11/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't reap connections that have already been reassigned
| * | | | | | | | Make connection stealing more explicitMatthew Draper2016-07-063-6/+27
| | | | | | | | |
| * | | | | | | | Reduce locking by taking ownership of stale connectionsMatthew Draper2016-07-061-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, we aren't racing other threads, so we don't need to re-check the conditional. And we no longer need to hold the lock while calling remove (which can choose to make a new connection while we wait).
| * | | | | | | | Re-check that the connection is still stale before we reap itMatthew Draper2016-07-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A concurrent thread may have also detected it to be stale, and already released (or even reassigned) it by now. Fixes #25585
| * | | | | | | | Check connection ownership before allowing a thread to release itMatthew Draper2016-07-061-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A thread can only release a connection if it owns it, or it's owned by a thread that has died.
* | | | | | | | | Merge pull request #25726 from Gaurav2728/update_doc_for_require_relativeMatthew Draper2016-07-072-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | updating doc for prefer require_relative [ci skip]
| * | | | | | | | update doc for prefer require_relative over require + File.expand_path [ci skip]Gaurav Sharma2016-07-072-5/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #25720 from timrogers/actiondispatch-ssl-defaults-docsप्रथमेश Sonpatki2016-07-061-4/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correct defaults in documentation for ActionDispatch::SSL
| * | | | | | | | [ci skip] Correct defaults in documentation for ActionDispatch::SSLTim Rogers2016-07-061-4/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | `config.ssl_options` permits configuring various options for the middleware. Default options for HSTS (specified with the `:hsts` key in the options hash) are specified in `.default_hsts_options`. The documentation did not make clear these defaults, and in one case was wrong.
* | | | | | | | Merge pull request #25717 from alexcameron89/connection_pool_docप्रथमेश Sonpatki2016-07-061-21/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Update ConnectionPool documentation for readability purposes
| * | | | | | | | [ci skip] Update ConnectionPool documentation for readabilityAlex Kitchens2016-07-061-21/+21
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #25716 from willnet/remove-rails-4प्रथमेश Sonpatki2016-07-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | [ci skip] Remove reference to Rails 4 in the initialization guide.
| * | | | | | | [ci skip] Remove reference to Rails 4 in the initialization guide.willnet2016-07-061-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commit removed reference to rails 4, but there is one left. https://github.com/rails/rails/commit/a9f50f87c38659d0e9425f86f613cf5328d55d27
* | | | | | | Merge pull request #25708 from maclover7/jm-master-bugreportsSantiago Pastorino2016-07-063-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bump version for master bug report templates
| * | | | | | | Bump version for master bug report templatesJon Moss2016-07-053-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #25710 from y-yagi/follow_up_to_24436प्रथमेश Sonpatki2016-07-064-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | remove `-t` option from default sendmail arguments [ci skip]
| * | | | | | | remove `-t` option from default sendmail arguments [ci skip]yuuji.yaginuma2016-07-064-5/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Follow up to #24436
* | | | | | | Merge pull request #24890 from vipulnsward/travel-to-raiseKasper Timm Hansen2016-07-054-14/+116
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | `travel/travel_to` travel time helpers, now raise on nested calls
| * | | | | | | `travel/travel_to` travel time helpers, now raise on nested calls,Vipul A M2016-07-024-14/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as this can lead to confusing time stubbing. Instead of: travel_to 2.days.from_now do # 2 days from today travel_to 3.days.from_now do # 5 days from today end end preferred way to achieve above is: travel_to 2.days.from_now # 2 days from today travel_back travel_to 5.days.from_now # 5 days from today Closes #24690 Fixes #24689
* | | | | | | | Merge pull request #25704 from ↵Rafael França2016-07-052-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fledman/add_respond_to_missing_to_rails_application_configuration_custom implement respond_to_missing? to match method_missing
| * | | | | | | | implement respond_to_missing? to match method_missingDavid Feldman2016-07-052-0/+11
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 06:00:44 +0000