aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Extract details to methods to clarify command.Kasper Timm Hansen2018-03-131-8/+12
|
* Remove changelog header for unreleased versionRafael Mendonça França2018-03-1310-20/+0
| | | | | | We only add the header when releasing to avoid some conflicts. [ci skip]
* Merge pull request #32231 from gmcgibbon/perform_email_jobs_in_assert_emailsRafael Mendonça França2018-03-133-6/+32
|\ | | | | | | Perform email jobs in #assert_emails
| * Perform email jobs in #assert_emailsGannon McGibbon2018-03-122-5/+29
| | | | | | | | Perform enqueued delivery jobs in #assert_emails and #assert_no_emails.
* | Merge pull request #32153 from bogdanvlviv/rails-routes-32130Kasper Timm Hansen2018-03-134-62/+49
|\ \ | | | | | | Change message on the empty result of searching routes by `rails routes` with `-c` or `-g`
| * | Introduce `ActionDispatch::Routing::ConsoleFormatter::Base`bogdanvlviv2018-03-133-59/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create `Base` and inherit `Sheet` and `Expanded` in order to - prevent code duplication. - Remove trailing "\n" for components of `Expanded`. - There is no need for `Expanded#header` to return `@buffer` so return `nil` instead. - Change `no_routes` message "No routes were found for this controller" since if use `-g`, it sounds incorrect. - Display `No routes were found for this controller.` if apply `-c`. - Display `No routes were found for this grep pattern.` if apply `-g`. Related to #32130
| * | Improve docs of `ActionDispatch::Routing`bogdanvlviv2018-03-131-3/+3
| | | | | | | | | | | | | | | - Add a mention about `-g`. - Improve info about `--expanded` option of `rails routes`.
* | | Merge pull request #32222 from ↵Kasper Timm Hansen2018-03-131-47/+896
|\ \ \ | |/ / |/| | | | | | | | bogdanvlviv/update-ruby_on_rails_5_2_release_notes Update "Ruby on Rails 5.2 Release Notes" Guide [ci skip]
| * | Update "Ruby on Rails 5.2 Release Notes" Guide [ci skip]bogdanvlviv2018-03-131-47/+896
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a description of major features in Rails 5.2. - Add a reference to Pull Request/Commit to every entry in CHANGELOGs, note that some of them combined. - Add section "Ruby on Rails Guides" with notable changes. - Note that - Skipped this since encrypted secrets are already on the way out. ``` * Add `rails secrets:show` command. ([Pull Request](https://github.com/rails/rails/pull/29695)) ``` - Skipped this since it was backported all the way to 5-0-stable. ``` * Make Rails' test runner work better with minitest plugins. ([Pull Request](https://github.com/rails/rails/pull/29572)) ``` Thanks to everyone who has been working on Rails 5.2! <3
* | Restore full Travis configGeorge Claghorn2018-03-121-1/+76
| |
* | Fix Azure signed URL generation with newer client libGeorge Claghorn2018-03-122-82/+5
| |
* | Redis cache store: fix constructing with a Redis instanceAdam Richardson2018-03-122-1/+7
| | | | | | | | | | | | | | | | Since `Redis#call` duck types as a Proc, we'd call `#call` on it, thinking it's a Proc. Fixed by check for the Proc explicitly instead of duck typing on `#call`. References #32233
* | Remove path option from AzureStorage configYuji Yaginuma2018-03-131-1/+0
| | | | | | | | Follow up of 309bb6c4d068b0d480681cf4ef1b90158527dfe5
* | Update ASt test services configGeorge Claghorn2018-03-122-1/+1
|/
* Remove path config option from Azure serviceAndrew White2018-03-123-8/+10
| | | | | | | | | | | The Active Storage service for Azure Storage has an option called `path` that is ambiguous in meaning. It needs to be set to the primary blob storage endpoint but that can be determined from the blobs client anyway. To simplify the configuration this commit removes the `path` option and gets the endpoint from the blobs client instead. Closes #32225.
* [ci skip] Add missing do.Kasper Timm Hansen2018-03-121-1/+1
|
* Add section to routing guide about config/routes.rb [ci skip]Andrew White2018-03-121-0/+20
| | | | Closes #32219.
* Merge pull request #32227 from ydakuka/fix-notes-marksEileen M. Uchitelle2018-03-127-9/+9
|\ | | | | Fix note marks
| * Fix note marks [ci skip]Yauheni Dakuka2018-03-127-9/+9
|/
* Merge pull request #32224 from bogdanvlviv/fix-rails_6_0-changelogsAndrew White2018-03-123-9/+7
|\ | | | | Fix CHANGELOGs [ci skip]
| * Fix CHANGELOGs [ci skip]bogdanvlviv2018-03-123-9/+7
|/ | | | | | | | - Add missing dots. - Remove reference to itself on GitHub. Usually, we add references to fixed issues only in a changelog. Follow up #32223
* Merge pull request #32160 from bogdanvlviv/improve-rails-routes-expandedKasper Timm Hansen2018-03-113-44/+67
|\ | | | | Draw line of a route name to the end of row console on `rails routes --expanded`
| * Draw line of a route name to the end of row console on `rails routes --expanded`bogdanvlviv2018-03-053-44/+67
| | | | | | | | | | | | | | In order to get width of console use `IO::console_size`, See https://ruby-doc.org/stdlib-2.4.1/libdoc/io/console/rdoc/IO.html#method-c-console_size Related to #32130
* | Remove unnecessary `Hash.method_defined?(:dig)` checkingyuuji.yaginuma2018-03-111-13/+11
| | | | | | | | Since Rails 6 requires Ruby 2.4.1+.
* | Do not show unnecessary message during server startupyuuji.yaginuma2018-03-101-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, `Exiting` is showed during server startup. ``` ./bin/rails s => Booting Puma => Rails 6.0.0.alpha application starting in development => Run `rails server --help` for more startup options Exiting Puma starting in single mode... * Version 3.11.2 (ruby 2.5.0-p0), codename: Love Song ``` This is because processing at server stop is passed as a block, and `Rack::Serve#start` receives a block and executes it during startup processing. https://github.com/rack/rack/blob/50db1ffdf8b98503fb7c6e6648622b5d7d78d58e/lib/rack/server.rb#L258 In order to avoid this, stop processing is passed as argument.
* | Merge pull request #32216 from Gaurav2728/update-psych-gemRafael França2018-03-092-3/+3
|\ \ | | | | | | update psych gem to 3.2 stable release
| * | update psych gem to 3.2 stable releaseGaurav Sharma2018-03-102-3/+3
|/ /
* | Merge pull request #32215 from M-Sayed/masterRichard Schneeman2018-03-091-2/+1
|\ \ | | | | | | Change doc for "polymorphic_path" in polymorphic_routes.rb
| * | Change doc for "polymorphic_path" in polymorphic_routes.rbMahmoud2018-03-091-2/+1
| | | | | | | | | | | | | | | The method 'polymorphic_path' is not using 'polymorphic_url' with `routing_type: :path` anymore in polymorphic_routes.rb
* | | Update some i18n references in guides (#32182)Chris Salzberg2018-03-091-8/+17
| | | | | | | | | | | | | | | | | | | | | * Remove reference to Globalize::Backend::Static as this class no longer exists. * Remove reference to google group * Remove confusing reference to Globalize3 * Add section on translating stored content
* | | Merge pull request #32212 from dharamgollapudi/patch-6Ryuta Kamizono2018-03-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fixes a typo and updates active_job_basics.md [ci skip]
| * | | Fixes a typo and updates active_job_basics.mdDharam Gollapudi2018-03-081-1/+1
| |/ / | | | | | | Fixes a typo
* | | Merge pull request #32213 from ↵Ryuta Kamizono2018-03-092-1/+6
|\ \ \ | |/ / |/| | | | | | | | | | | yujideveloper/feature/delegate-ar-base-pick-to-all Add `delegate :pick, to: :all`
| * | Add `delegate :pick, to: :all`Yuji Hanamura2018-03-092-1/+6
|/ /
* | Merge pull request #32210 from kivikakk/uri-selective-monkeypatchAaron Patterson2018-03-081-2/+9
|\ \ | | | | | | Only apply URI.unescape monkey-patch if detected to be required
| * | Only apply monkey-patch if detected to be requiredAshe Connor2018-03-091-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We test the failing case we're trying to patch; only if it throws an Exception do we patch. Currently this will *always* throw, but upstream Ruby has patched this bug: https://git.io/vAxKB Signed-off-by: Ashe Connor <ashe@kivikakk.ee>
* | | Always yield a CSP policy instanceAndrew White2018-03-083-17/+65
| | | | | | | | | | | | | | | If the app has the CSP disabled globally allow a controller action to enable the policy for that request.
* | | Add the ability to disable the global CSP in a controllerAndrew White2018-03-082-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | e.g: class LegacyPagesController < ApplicationController content_security_policy false, only: :index end
* | | Allow using inline style and script in the internal controllersyuuji.yaginuma2018-03-081-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use inline style and script for the view held inside Rails like welcome page and mailer preview. Therefore, if inline is prohibited by CSP, they will not work properly. I think that this is not as expected.   For that reason, I have made it possible to use inline style and script regardless of application settings.
* | | Quote string return values in doc examples [ci skip]Andrew White2018-03-081-2/+2
| | |
* | | Add example of maintaining context with `route_for`Andrew White2018-03-081-0/+6
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #32175 from bogdanvlviv/express-route_for-as-public-apiAndrew White2018-03-081-1/+13
|\ \ \ | |/ / |/| | Express `ActionDispatch::Routing::UrlFor#route_for` as public api
| * | Express `ActionDispatch::Routing::UrlFor#route_for` as public apibogdanvlviv2018-03-071-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | This method was added by #28462 but marked as private api. Since `route_for` looks good in pair with `ActionDispatch::Routing::Mapper::CustomUrls#direct` let's make it as public api. We use it in https://github.com/rails/rails/blob/e83575ff533690db86c92447a539d76b648e9fed/activestorage/config/routes.rb Closes #31417
* | | Merge pull request #32183 from kivikakk/uri-ext-fixEileen M. Uchitelle2018-03-073-2/+12
|\ \ \ | | | | | | | | URI.unescape "extension" fails with Unicode input
| * | | URI.unescape handles mixed Unicode/escaped inputAshe Connor2018-03-073-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, URI.enscape could handle Unicode input (without any actual escaped characters), or input with escaped characters (but no actual Unicode characters) - not both. URI.unescape("\xe3\x83\x90") # => "バ" URI.unescape("%E3%83%90") # => "バ" URI.unescape("\xe3\x83\x90%E3%83%90") # => # Encoding::CompatibilityError We need to let `gsub` handle this for us, and then force back to the original encoding of the input. The result String will be mangled if the percent-encoded characters don't conform to the encoding of the String itself, but that goes without saying. Signed-off-by: Ashe Connor <ashe@kivikakk.ee>
* | | | [ci skip] Hide internal docs from root AS moduleAshe Connor2018-03-061-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | We have a bunch of documentation in lib/active_support/core_ext/object/json.rb which is currently appearing as documentation for the top-level ActiveSupport module. We hide it from rdoc here. Signed-off-by: Ashe Connor <ashe@kivikakk.ee>
* | | Don't call changes in `changes_applied` unless requiredSean Griffin2018-03-061-1/+3
| | | | | | | | | | | | | | | | | | This is an alternate implementation of #31698. That PR makes assumptions that I do not want in the code base. We can fix the performance regression with a much simpler patch.
* | | Revert "PERF: Recover `changes_applied` performance (#31698)"Sean Griffin2018-03-064-45/+75
| | | | | | | | | | | | This reverts commit a19e91f0fab13cca61acdb1f33e27be2323b9786.
* | | Provide an alternative PDF previewer based on PopplerTerence Lee2018-03-068-35/+104
| | | | | | | | | | | | | | | | | | mutool is licensed under the Affero GPL, which has strict distribution requirements. Poppler is licensed under the more liberal GPL, making it a good alternative for those who can't use mutool.
* | | Update test to reflect GCS direct upload header changeGeorge Claghorn2018-03-061-1/+1
| | |