aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| | | | | |
* | | | | | Merge pull request #25668 from kamipo/use_squish_rather_than_strip_heredocRafael França2016-07-052-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use `squish` rather than `strip_heredoc`
| * | | | | | Use `squish` rather than `strip_heredoc`Ryuta Kamizono2016-07-042-4/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #25692 from ↵Rafael França2016-07-052-0/+18
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | johnmeehan/allow-registering-directory-for-rake-notes Allow rake notes to work with other directories.
| * | | | | Fix test to try `spec/` directory as opposed to `app/spec` which I hadJohn Meehan2016-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accidently set it to. Made the change and test still passes.
| * | | | | removed extra blank lineJohn Meehan2016-07-051-1/+0
| | | | | |
| * | | | | Allow rake notes to work with other directories.John Meehan2016-07-052-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional directories can be added using SourceAnnotationExtractor::Annotation.register_directories("spec", "other_dir") Result: rake notes will now extract notes from these directories.
* | | | | | Merge pull request #25693 from volmer/masterRafael França2016-07-052-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecate usage of nil as route path
| * | | | | | Deprecate usage of nil as route pathVolmer2016-07-052-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 4 these kind of routes used to work: ```ruby scope '/*id', controller: :builds, as: :build do get action: :show end ``` But since 1a830cbd830c7f80936dff7e3c8b26f60dcc371d, routes are only created for paths specified as strings or symbols. Implicit `nil` paths are just ignored, with no deprecation warnings or errors. Routes are simply not created. This come as a surprise for people migrating to Rails 5, since the lack of logs or errors makes hard to understand where the problem is. This commit introduces a deprecation warning in case of path as `nil`, while still allowing the route definition.
* | | | | | | Merge pull request #25257 from ta1kt0me/inspect_initializersRichard Schneeman2016-07-053-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Display railtie class name in `rails initializers`
| * | | | | | | Initializer provides its context class nameta1kt0me2016-06-123-3/+10
| | | | | | | |
| * | | | | | | Delegate public method for raitile nameta1kt0me2016-06-112-1/+3
| | | | | | | |
| * | | | | | | Display railtie class name in `rails initializers`ta1kt0me2016-06-021-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #25698 from CodingItWrong/action-cable-title-fixJon Moss2016-07-051-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add header demarcation to Action Cable guide
| * | | | | | | | Add header demarcation to Action Cable guideJosh Justice2016-07-051-1/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guide generation is configured to detect a guide header by a 40-or-more-hyphen long line. The Action Cable guide was missing this line, so the page title on the guides site was only showing "Ruby on Rails Guides", and the section title in the Kindle index was "Ruby on Rails Guides". Adding the header demarcation line back in fixes both of these. Fixes #25697 [ci skip]
* | | | | | | | Merge pull request #25696 from bquorning/link-to-the-right-documentationप्रथमेश Sonpatki2016-07-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Point to the correct documentation
| * | | | | | | | Point to the correct documentation [ci skip]Benjamin Quorning2016-07-051-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The options used in this file are *not* directly described in the Rails 5.0 release notes (http://edgeguides.rubyonrails.org/5_0_release_notes.html), but instead in section 2 of the Guide for Upgrading Ruby on Rails document (http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html).
* | | | | | | | Merge pull request #25687 from Paperback/masterRichard Schneeman2016-07-041-4/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Robots.txt removed disallow all instructions
| * | | | | | | Robots.txt removed disallow all instructionsSam Sweeney2016-07-051-4/+0
| | |/ / / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 12:13:35 +0000