aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #36777 from Edouard-chin/ec-git-pretty-credentialsRafael França2019-07-264-9/+185
|\ \ \ \ \ \ | | | | | | | | | | | | | | Prettify diff generated by git for encrypted file:
| * | | | | | Prettify diff generated by git for encripted file:Edouard CHIN2019-07-264-9/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - @sinsoku had the idea and started implementing it few months ago but sadly didn't finish it. This PR is taking over his work. The credentials feature has changed a lot since @sinsoku opened hi PR, it was easier to just restart from scratch instead of checking out his branch. Sinsoku will get all the credit he deserves for this idea :) TL;DR on that that feature is to make the `git diff` or `git log` of encrypted files to be readable. The previous implementation was only setting up the git required configuration for the first time Rails was bootstraped, so I decided to instead provide the user a choice to opt-in for readable diff credential whenever a user types the `bin/rails credentials:edit` command. The question won't be asked in the future the user has already answered or if the user already opted in. Co-authored-by: Takumi Shotoku <insoku.listy@gmail.com>
* | | | | | | Merge pull request #36779 from Shopify/optimize-url-helper-creationRafael França2019-07-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Optimize Journey::Route#glob?
| * | | | | | | Optimize Journey::Route#glob?Jean Boussier2019-07-261-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #36776 from ↵Rafael França2019-07-262-3/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | giraffate/fix_join_middle_table_alias_when_using_HABTM Fix join middle table alias when using HABTM
| * | | | | | | | Fix join middle table alias when using HABTMTakayuki Nakata2019-07-262-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In using HABTM, join middle table alias is combined with the associated models name without sort, while middle table name is combined with those models name with sort. Fixes #36742.
* | | | | | | | | Merge pull request #36764 from ↵Rafael França2019-07-262-0/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | willianveiga/feature/inputs-inside-disabled-fieldset-are-not-submited-on-remote-true-forms Inputs inside disabled fieldset are not submited on remote: true forms
| * | | | | | | | | Add test for submitted fields within disabled fieldsetsWillian Gustavo Veiga2019-07-261-0/+18
| | | | | | | | | |
| * | | | | | | | | Issue #36728 - Inputs inside disabled fieldset are not submited on remote: ↵Willian Gustavo Veiga2019-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | true forms
* | | | | | | | | | Merge pull request #36213 from st0012/fix-25842Rafael França2019-07-265-7/+60
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Add `Vary: Accept` header when using `Accept` header for response
| * | | | | | | | | Add `Vary: Accept` header when renderingst00122019-07-265-7/+60
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem description (quoted from @rafaelfranca's excellent explanation in https://github.com/rails/jquery-ujs/issues/318#issuecomment-88129005): > Let say that we requested /tasks/1 using Ajax, and the previous page has the same url. When we click the back button the browser tries to get the response from its cache and it gets the javascript response. With vary we "fix" this behavior because we are telling the browser that the url is the same but it is not from the same type what will skip the cache. And there's a Rails issue discussing about this problem as well https://github.com/rails/rails/issues/25842 Also, according to [RFC 7231 7.1.4](https://tools.ietf.org/html/rfc7231#section-7.1.4) > An origin server SHOULD send a Vary header field when its algorithm > for selecting a representation varies based on aspects of the request > message other than the method and request target we should add `Vary: Accept` header when determining content based on the `Accept` header. Although adding such header by default could cause unnecessary cache invalidation. But this PR only adds the header if: - The format param is not provided - The request is a `xhr` request - The request has accept headers and the headers are valid So if the user - sends request with explicit format, like `/users/1.json` - or sends a normal request (non xhr) - or doesn't specify accept headers then the header won't be added. See the discussion in https://github.com/rails/rails/issues/25842 and https://github.com/rails/rails/pull/36213 for more details.
* | | | | | | | | Merge pull request #35992 from jduff/include_bccRafael França2019-07-264-1/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Bcc header missing with emails from conductor and test helpers
| * | | | | | | | | Fix Bcc header missing with emails from conductor and test helpersJohn Duff2019-07-264-1/+39
| |/ / / / / / / /
* | | | | | | | | Merge pull request #36778 from ↵Rafael França2019-07-261-2/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abhaynikam/remove-unwanted-javascript-compile-from-test Removed webpacker:compile step from scaffold test as it is not required
| * | | | | | | | | Removed webpacker:compile step from scaffold test as it is not required and ↵Abhay Nikam2019-07-261-2/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | assets are already precompiled in build_app step
* | | | | | | | | Merge pull request #36372 from instructure-bridge/6-0-stableRafael França2019-07-262-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't break configurations.each, .first before the deprecation period
* | | | | | | | | Merge pull request #36771 from ajn123/add-documentation-for-csrf-javascriptRafael França2019-07-261-0/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] add CSRF token explanation for javascript documentation
| * | | | | | | | | [ci skip] add CSRF token explanation for javascript documentationajn1232019-07-261-0/+18
| | | | | | | | | |
* | | | | | | | | | Merge pull request #36772 from sharang-d/default-for-digestRafael França2019-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Add a default value for arg `format` in `ActionView::Digestor.digest()`
| * | | | | | | | | Add a default value for arg `format` in `ActionView::Digestor.digest()`Sharang Dashputre2019-07-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #36300 from okuramasafumi/make-handle-options-privateRafael França2019-07-261-22/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make `handle_options` method private
| * | | | | | | | | Make `handle_options` method privateOKURA Masafumi2019-05-181-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `handle_options` method in `CookieJar` is used internal only, so it should be private.
* | | | | | | | | | Merge pull request #35334 from sharang-d/digest-doc-updateRafael França2019-07-261-3/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update comment for ActionView::Digestor.digest [ci skip]
| * | | | | | | | | | Update comment for ActionView::Digestor.digest [ci skip]Sharang Dashputre2019-04-161-3/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #36180 from jonathanhefner/optimize-string-fromRafael França2019-07-251-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Avoid extra allocation in String#from and #to
| * | | | | | | | | | | Avoid extra allocation in String#from and #toJonathan Hefner2019-05-051-2/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unnecessary Range object allocations for a significant speed-up. String#from Comparison: new: 3378594.0 i/s old: 2380129.8 i/s - 1.42x slower String#to Comparison: new: 2866175.7 i/s old: 2304406.4 i/s - 1.24x slower
* | | | | | | | | | | Use correct variable in `secure_compare!`yuuji.yaginuma2019-07-262-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Messages::Rotator` has `@on_rotation` not `@rotation`. https://github.com/rails/rails/blob/72bc0806a7b378cd544e8fbf7ab22d74b7913ffb/activesupport/lib/active_support/messages/rotator.rb#L11
* | | | | | | | | | | Merge pull request #36005 from shioyama/plain_matcher_firstRafael França2019-07-251-9/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | Make plain matcher match first, not last
| * | | | | | | | | | Remove plain methodChris Salzberg2019-05-311-4/+0
| | | | | | | | | | |
| * | | | | | | | | | Make plain matcher match first, not lastChris Salzberg2019-05-311-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code takes the "plain" matcher with no prefix and suffix and puts it at the end of the matchers array such that it is de-prioritized among all matchers. The comment explaining this code, originally from commimt 8b8b7143efe dated in 2011, is in a context where detection from matchers happened immediately. In that situation, the plain matcher would indeed always match first and no others would ever be used. However, the current code does not immediately detect one match but rather maps matchers to matches for the method_name. Detection only happens for matches whose attribute name is valid. In this context, there is no need to bump the plain matcher to the end of the array, since it will only be selected if the attribute name it catpures matches a valid attribute name.
* | | | | | | | | | | Merge pull request #36504 from mtsmfm/mtsmfm/fix-flaky-render-testRafael França2019-07-251-4/+20
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix flaky test ActionControllerBaseRenderTest#test_direct_render_to_string
| * | | | | | | | | | | Fix flaky test ActionControllerBaseRenderTest#test_direct_render_to_stringFumiaki MATSUSHIMA2019-07-261-4/+20
|/ / / / / / / / / / /
* | | | | | | | | | | Correct assertion argument orderGeorge Claghorn2019-07-251-2/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #36576 from mtsmfm/mtsmfm/fix-fixture-resolverRafael Mendonça França2019-07-252-13/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support :any variants for ActionView::FixtureResolver
| * | | | | | | | | | | Support :any variants for FixtureResolverFumiaki MATSUSHIMA2019-06-302-13/+47
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #36767 from ↵Rafael França2019-07-253-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vlado/active_job_test_helper_can_now_handle_relative_at_options Ability to test activejobs with relative delay
| * | | | | | | | | | | | Ability to test activejobs with relative delayVlado Cingel2019-07-263-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `assert_enqueued_with` and `assert_performed_with` were not able to properly test jobs with relative delay. `:at` option was asserted for equality and test will always fail cause small fraction of time will pass between job call and assertion. This commit fixes that by droping microseconds from `:at` argument assertions.
* | | | | | | | | | | | | Merge pull request #36765 from kylekeesling/patch-1Rafael França2019-07-252-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix filenames of attachments created via the inbound email conductor
| * | | | | | | | | | | | | Fix filenames of attachments created via the inbound email conductorKyle Keesling2019-07-252-1/+3
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller passed along attachment file paths instead of their filenames
* | | | | | | | | | | | | Merge pull request #36747 from ↵y-yagi2019-07-261-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/add_mention_about_collection_cache_versioning Add mention about `active_record.collection_cache_versioning` to the `new_framework_defaults.rb`
| * | | | | | | | | | | | | Add mention about `active_record.collection_cache_versioning` to the ↵yuuji.yaginuma2019-07-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `new_framework_defaults.rb` All other recommended new configurations that set in `load_defaults` are already mentioned in `new_framework_defaults.rb`. So `active_record.collection_cache_versioning` should also be mentioned.
* | | | | | | | | | | | | | Merge pull request #36770 from seejohnrun/database-env-current-env-onlyEileen M. Uchitelle2019-07-252-18/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only merge DATABASE_URL settings into the current env
| * | | | | | | | | | | | | | Only merge DATABASE_URL settings into the current envJohn Crepezzi2019-07-252-18/+36
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a regression where when the `DATABASE_URL` environment variable was set and the current Rails environment had a valid configuration defined in the database config, settings from the environment variable would affect _all_ environments (not just the current one).
* | | | | | | | | | | | | | Merge pull request #36731 from jhawthorn/dir_glob_base_instead_of_chdirJohn Hawthorn2019-07-251-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Use Dir.glob(base: ...) to avoid chdir
| * | | | | | | | | | | | | Use Dir.glob(base: ...) to avoid chdirJohn Hawthorn2019-07-221-6/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #36766 from jhawthorn/call_connection_error_numberJohn Hawthorn2019-07-252-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use connection.error_number in MySQLDatabaseTasks
| * | | | | | | | | | | | | | Use connection.error_number in MySQLDatabaseTasksJohn Hawthorn2019-07-252-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQLDatabaseTasks, like AbstractMysqlAdapter, should be able to operate on any mysql adapter, not just mysql2. Errors having a .error_number attribute is a mysql2 specific API, which we (Rails) don't control, so we should instead use connection.error_number(err), which we do. This also updates tests to better test how this really works, previously it stubbed create_database to raise Tasks::DatabaseAlreadyExists, which can never happen.
* | | | | | | | | | | | | | | Fixup 64a430129fKasper Timm Hansen2019-07-251-3/+5
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Use binding.local_variable_get for `:for`Kasper Timm Hansen2019-07-251-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies the surrounding code outside `convert_value`. Ref: https://github.com/rails/rails/pull/36758
* | | | | | | | | | | | | | | Merge pull request #36380 from ↵Rafael Mendonça França2019-07-253-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edudepetris/ed/36272-better-negative-scope-warning Add a warning for enum elements with 'not_' prefix.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 11:10:15 +0000