Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New settings for disable comments and social #2304

Merged
merged 10 commits into from
Feb 9, 2024

Conversation

FherStk
Copy link
Contributor

@FherStk FherStk commented Dec 27, 2023

Related with: #2298

Added new settings to disable social and comments sections (false by default):
image

Blog post example with social and comments enabled (by default):
image

Blog post example with social and comments disabled:
image

@codecov-commenter
Copy link

codecov-commenter commented Dec 27, 2023

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (86c234f) 46.78% compared to head (09dc460) 46.76%.

Files Patch % Lines
judge/views/blog.py 0.00% 2 Missing ⚠️
judge/views/contests.py 0.00% 2 Missing ⚠️
judge/views/problem.py 0.00% 2 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2304      +/-   ##
==========================================
- Coverage   46.78%   46.76%   -0.02%     
==========================================
  Files         251      251              
  Lines       13309    13317       +8     
==========================================
+ Hits         6226     6228       +2     
- Misses       7083     7089       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@FherStk FherStk mentioned this pull request Dec 27, 2023
dmoj/settings.py Outdated Show resolved Hide resolved
Copy link
Member

@Xyene Xyene left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise LGTM -- could you please rebase and squash your commits? Then we can go ahead and merge this.

dmoj/settings.py Outdated Show resolved Hide resolved
@FherStk
Copy link
Contributor Author

FherStk commented Jan 2, 2024

Otherwise LGTM -- could you please rebase and squash your commits? Then we can go ahead and merge this.

I'm not used to squash and rebase, but I hope I squashed it correctly :)

@Xyene
Copy link
Member

Xyene commented Jan 12, 2024

Not quite :)

You want to run git rebase -i HEAD~10, which will bring up interactive rebase for the last 10 commits, and change the last few lines to

...
pick 47863906 new settings options for disabling comments and social
s eec0b6a9 new settings options for disabling comments and social
s a528dd54 disable-{social | comments} --> enable-{social | comments}
s 9f2f5fa5 Fixes for 2304#d

s short for 'squash', see the big comment in interactive rebase for details. Then you'll be prompted to fix up the commit text for the commit things are being squashed into (47863906), after which you'll be able to --force push the result onto your branch.

FherStk and others added 3 commits February 6, 2024 12:11
new settings options for disabling comments and social

disable-{social | comments} --> enable-{social | comments}

Fixes for 2304#discussion_r1439114231
@FherStk
Copy link
Contributor Author

FherStk commented Feb 6, 2024

Not quite :)

You want to run git rebase -i HEAD~10, which will bring up interactive rebase for the last 10 commits, and change the last few lines to

...
pick 47863906 new settings options for disabling comments and social
s eec0b6a9 new settings options for disabling comments and social
s a528dd54 disable-{social | comments} --> enable-{social | comments}
s 9f2f5fa5 Fixes for 2304#d

s short for 'squash', see the big comment in interactive rebase for details. Then you'll be prompted to fix up the commit text for the commit things are being squashed into (47863906), after which you'll be able to --force push the result onto your branch.

Hi,

Sorry for the delay, I've been a little overwhelmed with my work, but I hope I squashed correctly now. I'm very grateful for all your help and support.

Thanks again!
Fher

Copy link
Member

@Xyene Xyene left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution!

@Xyene Xyene merged commit df99fe3 into DMOJ:master Feb 9, 2024
3 checks passed
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was this submodule updated?

Copy link
Contributor Author

@FherStk FherStk Feb 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is related with my tries of squashing commits, because the links displays no changes:
imagen
imagen

@FherStk FherStk mentioned this pull request Feb 9, 2024
@FherStk FherStk deleted the option_for_disable_comments branch August 12, 2024 11:14
@FherStk FherStk restored the option_for_disable_comments branch August 12, 2024 11:41
@FherStk FherStk deleted the option_for_disable_comments branch August 12, 2024 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants