-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Add filter to remove spammed account from tag contributors listing #8418
Add filter to remove spammed account from tag contributors listing #8418
Conversation
Thanks for opening this pull request! This space is protected by our Code of Conduct - and we're here to help. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nadimakhtar97 this looks good to me and same as it is required in #8174 . Nice work 🎉
I've just reviewed 5161224 only. |
@avats-dev I am also confused. I will surely look into the matter and resolve it soon. And sorry if I did any mistakes. |
@nadimakhtar97 rebasing should fix it.. |
Okay I will do it. Thanks |
do I need to create new pull request? @cesswairimu |
Not necessarily, after the rebase on your local branch do |
@cesswairimu after I did git pull upstream main on my main branch there arised some merge conflicts on files app/assets/stylesheets/print_new.css |
oh, seems like you made the commit on your main branch before you created the branch. |
Thanks that will be very helpful. @cesswairimu |
5161224
to
b7ffc6d
Compare
I just pushed, I think we should be good |
Thanks again |
Codecov Report
@@ Coverage Diff @@
## main #8418 +/- ##
=======================================
Coverage 81.89% 81.89%
=======================================
Files 101 101
Lines 5900 5900
=======================================
Hits 4832 4832
Misses 1068 1068
|
You are welcome and thanks for working on this 🎉 . We should be ready to merge once travis build is done |
@cesswairimu can you please make me understand what mistake I did so that I don't do that again. |
It seems your main was not upto date with upstream/main the conflict was between your orgin/main and upstream/main it was not a mistake just a conflict on one of the files |
to be on the updated main, I recommend to always pull from upstream on the main branch then create your work branches from there |
By the way I am still stuck in my local repository with merge conflicts . How do I solve them? need help @cesswairimu . |
Open each of the files in red and accept the changes coming in..by deleting the changes marked with your last commit and leave the ones with |
Congrats on merging your first pull request! 🙌🎉⚡️ Help others take their first stepNow that you've merged your first pull request, you're the perfect person to help someone else out with this challenging first step. 🙌 Try looking at this list of `first-timers-only` issues, and see if someone else is waiting for feedback, or even stuck! 😕 People often get stuck at the same steps, so you might be able to help someone get unstuck, or help lead them to some documentation that'd help. Reach out and be encouraging and friendly! 😄 🎉 Read about how to help support another newcomer here, or find other ways to offer mutual support here. |
Thanks for working on this 🎉 and welcome to PublicLab 🎈 |
@cesswairimu @avats-dev where can I interact with the public lab's community? |
Hey you can find us all over here https://gitter.im/publiclab/publiclab 😃 |
Also we have weekly check-ins where you can say hi, and ask for help if you are stuck |
Fixes #8174 (<=== Add issue number here)
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
rake test
@publiclab/reviewers
for help, in a comment belowIf tests do fail, click on the red
X
to learn why by reading the logs.Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software
Thanks!