aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #30797 from y-yagi/fix_formatting_of_use_zoneRyuta Kamizono2017-10-041-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix formatting of `Time.use_zone` [ci skip]
| * | | | | Fix formatting of `Time.use_zone` [ci skip]yuuji.yaginuma2017-10-041-4/+4
|/ / / / /
* | | | | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-10-043-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add missing credit * Add backticks * Fix indentation * Remove trailing spaces And some minor tweaks.
* | | | | Prefer official name PostgreSQL over PostgresRyuta Kamizono2017-10-041-2/+2
| | | | |
* | | | | Merge pull request #30794 from yhirano55/fix_third_party_libs_listRyuta Kamizono2017-10-041-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix third-party system libraries list in ActiveStorage::Preview [ci skip]
| * | | | | Fix third-party system libraries list in ActiveStorage::Preview [ci skip]Yoshiyuki Hirano2017-10-041-2/+2
|/ / / / /
* | | | | Associate blobs with their attachmentsGeorge Claghorn2017-10-031-0/+2
| | | | |
* | | | | Merge pull request #30786 from y-yagi/add_test_case_for_font_urlRyuta Kamizono2017-10-031-0/+26
|\ \ \ \ \ | | | | | | | | | | | | Add test case for `font_url`
| * | | | | Add test case for `font_url`yuuji.yaginuma2017-10-031-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Since test of `font_url` was not in Action View's test suite, so it added.
* | | | | | Merge pull request #30781 from mcmire/patch-1Guillermo Iguaran2017-10-021-23/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | rails-ujs: Update README
| * | | | | rails-ujs: Update READMEElliot Winkler2017-10-021-23/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make various wording tweaks to cater to users who are viewing the README on NPM. Notably, don't highlight Yarn specifically in the installation instructions -- even though this is the preferred tool of choice especially in the Ruby community, some people still use NPM (and, really, ES2015+ syntax has nothing to do with NPM or Yarn).
* | | | | Merge pull request #30774 from atd/masterRyuta Kamizono2017-10-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add link to Rack website [ci skip]
| * | | | | Add link to Rack websiteAntonio Tapiador del Dujo2017-10-021-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resemble links to Bundler and Yarn, based on feedback by @kamipo [ci skip]
* | | | | Make internal methods in `AbstractController::Rendering` to privateRyuta Kamizono2017-10-021-0/+1
| | | | |
* | | | | Merge pull request #30763 from y-yagi/remove_unused_methodRyuta Kamizono2017-10-011-8/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused `new_credentials_configuration`
| * | | | Remove unused `new_credentials_configuration`yuuji.yaginuma2017-10-011-8/+0
|/ / / / | | | | | | | | | | | | `new_credentials_configuration` is no longer used since 081a6ac6f7fd929798481f9ee333fb92b441356c.
* | | | Merge pull request #30761 from patrickdavey/fix_broken_link_in_security_guideRyuta Kamizono2017-10-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix broken link to recaptcha.net [ci skip]
| * | | | Fix broken link to recaptcha.net [ci skip]Patrick Davey2017-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The link to recaptcha.net returns a 404. As far as I can tell, the new link ought to be to https://developers.google.com/recaptcha/ .
* | | | | Ensure `AliasTracker` respects a custom table nameRyuta Kamizono2017-09-303-6/+10
| | | | |
* | | | | Remove `:api:` tag that has leaked on the doc directly [ci skip]Ryuta Kamizono2017-09-306-29/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `:api:` tag has leaked on the doc directly since RDoc doesn't support `:api:` tag directive. http://api.rubyonrails.org/v5.1/classes/AbstractController/Rendering.html So `:api: private` doesn't work as expected. We are using `:nodoc:` for the purpose. Related #13989.
* | | | | Merge pull request #30759 from y-yagi/remove_unused_methodsRyuta Kamizono2017-09-301-10/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused methods from `RenderPartialWithRecordIdentificationController`
| * | | | | Remove unused methods from `RenderPartialWithRecordIdentificationController`yuuji.yaginuma2017-09-301-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | These methods no longer used since a3da293.
* | | | | | Testing to ensure both bang and non-bang methods behaves consistentlyRyuta Kamizono2017-09-301-0/+23
| |/ / / / |/| | | | | | | | | | | | | | Follow up of #30728.
* | | | | Merge pull request #30756 from ↵Ryuta Kamizono2017-09-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/dont_use_active_support_where_it_is_not_needed Don't use Active Support where it is not needed.
| * | | | | Don't use Active Support where it is not needed.yuuji.yaginuma2017-09-301-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code has been changed with https://github.com/rails/rails/pull/30735/files#diff-8e5f6b33c191ad6dec07f3288345a13fL47. However, `active_support/time` is not load automatically, so if use Action Pack alone, `days` method can not use and an error occurs. In this case, I think that there is no problem by specifying a value with Integer.
* | | | | Merge pull request #30755 from y-yagi/fix_method_refined_warningRyuta Kamizono2017-09-301-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix "warning: method redefined; discarding old test_scaffold_plural_names"
| * | | | Fix "warning: method redefined; discarding old test_scaffold_plural_names"yuuji.yaginuma2017-09-301-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since warning was issued due to duplication of test names, fix the test name to a meaningful name. This fixes following warnings: ``` railties/test/generators/named_base_test.rb:141: warning: method redefined; discarding old test_scaffold_plural_names railties/test/generators/named_base_test.rb:62: warning: previous definition of test_scaffold_plural_names was here ```
* | | | Fix `test "signed URL generation"` failureRyuta Kamizono2017-09-301-1/+1
| | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/281044755#L5582-L5586
* | | | Fix "warning: `*' interpreted as argument prefix"Ryuta Kamizono2017-09-301-1/+1
| | | |
* | | | Merge pull request #30735 from tjschuck/fix_doc_code_formattingEileen M. Uchitelle2017-09-291-33/+38
|\ \ \ \ | | | | | | | | | | Fix formatting in ActionDispatch::SSL middleware docs
| * | | | Fix formatting in ActionDispatch::SSL middleware docsT.J. Schuck2017-09-271-33/+38
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Before: https://monosnap.com/file/J6xewF0tYpm6dC9nSTe82ddsHAOcM5.png After: https://monosnap.com/file/0tCYicLXNqRHAEMDb81u0aLb3gH9Wf.png [ci skip]
* | | | Merge pull request #30746 from conradbeach/masterVipul A M2017-09-291-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix Typo in Testing Guide [ci skip]
| * | | [ci skip] Fix typo.Conrad Beach2017-09-281-1/+1
|/ / /
* | | Preview PDFs and videosGeorge Claghorn2017-09-2836-68/+444
| | |
* | | Test for nil, people not likely to assign it false.Kasper Timm Hansen2017-09-281-2/+2
| | |
* | | Merge pull request #30709 from ↵Kasper Timm Hansen2017-09-282-3/+28
|\ \ \ | | | | | | | | | | | | | | | | mikeycgto/actiondispatch-use-aead-encrypted-cookies-patch Fixes for use_authenticated_cookie_encryption
| * | | Fixes for use_authenticated_cookie_encryptionMichael Coyne2017-09-272-3/+28
| | | | | | | | | | | | | | | | Use CBC encryption is this configuration value is set to false
* | | | Deprecate secret_token, long since usurped by secret_key_base.Kasper Timm Hansen2017-09-285-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the changelog entry. Remove `secrets.secret_token` from the bug report templates, since we don't accept bug reports for Rails versions that don't support a `secret_key_base`. [ claudiob & Kasper Timm Hansen ]
* | | | Merge pull request #30736 from ↵Ryuta Kamizono2017-09-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bogdanvlviv/fix-activestorage-package_json_version_format Set version in activestorage/package.json in proper format.
| * | | | Set version in activestorage/package.json in proper format.bogdanvlviv2017-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `5.2.0.alpha` => `5.2.0-alpha` System versioning isn't compliant with npm.
* | | | | Merge pull request #30695 from mikker/add-asserts-enqueued-emails-withGeorge Claghorn2017-09-273-0/+92
|\ \ \ \ \ | | | | | | | | | | | | Add assert_enqueued_email_with to ActionMailer::TestHelper
| * | | | | Add assert_enqueued_email_with to ActionMailer::TestHelperMikkel Malmberg2017-09-273-0/+92
| | | | | |
* | | | | | Merge pull request #30471 from dylanahsmith/remove-redundant-trackerAaron Patterson2017-09-272-24/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | activerecord: Remove a redundant mutation tracker
| * | | | | activerecord: Remove a redundant mutation trackerDylan Thacker-Smith2017-08-302-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extra mutation tracker was needed in Rails 5.1 to preserve the old behaviour of `changes`, but now there is no difference between `changes` and `changes_to_save`, so `@mutation_tracker` can be removed.
* | | | | | Merge pull request #30729 from yalab/nested_scaffoldAaron Patterson2017-09-276-10/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | Nested scaffold should be fine
| * | | | | | scaffold nested name controller should be fine.yalab2017-09-276-10/+75
| | | | | | |
* | | | | | | Merge pull request #30614 from kami-zh/yarn-on-bin-updateJavan Makhmali2017-09-271-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Align `bin/update`'s Yarn usage with `bin/setup`
| * | | | | | | Install JavaScript dependencies on updatekami-zh2017-09-161-0/+5
| | | | | | | |
* | | | | | | | Add newlines before/after the `git_source` in bug report templatesRyuta Kamizono2017-09-2711-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #30728 from ↵Ryuta Kamizono2017-09-273-0/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | y-yagi/ensure_transform_keys_of_hwida_to_return_hwida Ensure `HashWithIndifferentAccess#transform_keys` to return `HashWithIndifferentAccess`