[pull] main from forem:main #97
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [flipper-active_support_cache_store](https://github.com/jnunemaker/flipper) from 0.23.0 to 0.23.1. - [Release notes](https://github.com/jnunemaker/flipper/releases) - [Changelog](https://github.com/jnunemaker/flipper/blob/master/Changelog.md) - [Commits](flippercloud/flipper@v0.23.0...v0.23.1) --- updated-dependencies: - dependency-name: flipper-active_support_cache_store dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [flipper-ui](https://github.com/jnunemaker/flipper) from 0.23.0 to 0.23.1. - [Release notes](https://github.com/jnunemaker/flipper/releases) - [Changelog](https://github.com/jnunemaker/flipper/blob/master/Changelog.md) - [Commits](flippercloud/flipper@v0.23.0...v0.23.1) --- updated-dependencies: - dependency-name: flipper-ui dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [flipper-active_record](https://github.com/jnunemaker/flipper) from 0.23.0 to 0.23.1. - [Release notes](https://github.com/jnunemaker/flipper/releases) - [Changelog](https://github.com/jnunemaker/flipper/blob/master/Changelog.md) - [Commits](flippercloud/flipper@v0.23.0...v0.23.1) --- updated-dependencies: - dependency-name: flipper-active_record dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.42.0 to 5.43.0. - [Release notes](https://github.com/stripe/stripe-ruby/releases) - [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md) - [Commits](stripe/stripe-ruby@v5.42.0...v5.43.0) --- updated-dependencies: - dependency-name: stripe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Let override of ToS and CoC show in onboarding Prior to this commit any changes to the terms or code of conduct were not reflected in the onboarding links. With this commit, I'm leveraging a newly created method that first checks if there's a page for the given slug. If there is, use that page's copy. To test: - Overwrite default /terms page on a Forem - Navigate to /onboarding or sign up as a new user - Click on Terms of Use link text - Review Terms of Use Closes #15296 * Adding spec around not passing a block
The fix might be a bit of a work-around for a more general approach, but we're fighting against the magic of the points vs. explicit_points tension as defined in the [Follows::UpdatePointsWorker][1]. That is to say, it's possible (and happens) where I have assigned an `explicit_points` of 1 for a tag, but the calculated `points` are less than 1. The calculated `points` are what we send forward in the [AsyncInfoController][1] (by way of the [UserDecorator#cached_followed_tags][3] method). In DEV, I ran the following queries: **User assigned points `>= 1` but calculated `< 1`** 985,352 records ```sql SELECT count(id) FROM follows WHERE followable_type = 'ActsAsTaggableOn::Tag' AND points < 1 AND explicit_points >= 1; ``` **User assigned points `>= 1` but calculated `>= 1`** 5,366,478 records ```sql SELECT count(id) FROM follows WHERE followable_type = 'ActsAsTaggableOn::Tag' AND points >= 1 AND explicit_points >= 1; ``` **User assigned points `>= 1` but calculated `>= 0`** 0 records. ```sql SELECT count(id) FROM follows WHERE followable_type = 'ActsAsTaggableOn::Tag' AND points <= 0 AND explicit_points >= 1; ``` **User assigned points `<= 0` but calculated `> 0`** 1,146 records ```sql SELECT count(id) FROM follows WHERE followable_type = 'ActsAsTaggableOn::Tag' AND points > 0 AND explicit_points <= 0; ``` Synthesizing that, almost 1 million tag follows of the total 6.3 million are not showing up in the user's left navigation. And 5.3 million are roughly correct. In adjusting the logic, we're now going to have more tags showing up in the left. And just over 1,000 might now show up that would be unexpected. Closes #14937. [1]:https://github.com/forem/forem/blob/c63e0b629e1edd0b7f2ce03952cf6bf552c7b8d8/app/workers/follows/update_points_worker.rb [2]:https://github.com/forem/forem/blob/c63e0b629e1edd0b7f2ce03952cf6bf552c7b8d8/app/controllers/async_info_controller.rb#L40-L65 [3]:https://github.com/forem/forem/blob/c63e0b629e1edd0b7f2ce03952cf6bf552c7b8d8/app/decorators/user_decorator.rb#L23-L34
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )