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

Add filter to remove spammed account from tag contributors listing #8418

Merged

Conversation

nadimakhtar97
Copy link
Contributor

@nadimakhtar97 nadimakhtar97 commented Sep 21, 2020

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!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If 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!

@nadimakhtar97 nadimakhtar97 requested review from a team as code owners September 21, 2020 17:48
@welcome
Copy link

welcome bot commented Sep 21, 2020

Thanks for opening this pull request! This space is protected by our Code of Conduct - and we're here to help.
Dangerbot will test out your code and reply in a bit with some pointers and requests.
Also please refer here for installation help 💿
There may be some errors, but don't worry! We'll work through them with you! 👍🎉😄
It would be great if you can tell us your Twitter handle so we can thank you properly?

@gitpod-io
Copy link

gitpod-io bot commented Sep 21, 2020

Copy link
Member

@avats-dev avats-dev left a 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 🎉

@avats-dev
Copy link
Member

@nadimakhtar97 this looks good to me and same as it is required in #8174 . Nice work tada

I've just reviewed 5161224 only.
Also, how these many commits happened here in this PR, I'm not getting this. @cesswairimu ?

@nadimakhtar97
Copy link
Contributor Author

@avats-dev I am also confused. I will surely look into the matter and resolve it soon. And sorry if I did any mistakes.

@cesswairimu
Copy link
Collaborator

cesswairimu commented Sep 21, 2020

@nadimakhtar97 rebasing should fix it..
on the main branch do git pull upstream main assuming "upstream" is the publiclab/plots2 remote
then checkout to your branch and do git rebase -i main

@nadimakhtar97
Copy link
Contributor Author

@nadimakhtar97 rebasing should fix it..
on the main branch do git pull upstream main assuming "upstream" is the publiclab/plots2 remote
then checkout to your branch and do git rebase -i main

Okay I will do it. Thanks

@nadimakhtar97
Copy link
Contributor Author

do I need to create new pull request? @cesswairimu

@cesswairimu
Copy link
Collaborator

Not necessarily, after the rebase on your local branch do
git push -f origin add-filter-to-remove-spammed account assuming "origin" is your fork.
It should update here

@nadimakhtar97
Copy link
Contributor Author

@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
app/controllers/notes_controller.rb
app/controllers/wiki_controller.rb

Screenshot from 2020-09-22 00-04-49

@cesswairimu
Copy link
Collaborator

oh, seems like you made the commit on your main branch before you created the branch.
Let me pull your branch see If I can rebase on my end

@nadimakhtar97
Copy link
Contributor Author

oh, seems like you made the commit on your main branch before you created the branch.
Let me pull your branch see If I can rebase on my end

Thanks that will be very helpful. @cesswairimu

@cesswairimu cesswairimu force-pushed the add-filter-to-remove-spammed-account branch from 5161224 to b7ffc6d Compare September 21, 2020 18:43
@cesswairimu
Copy link
Collaborator

I just pushed, I think we should be good

@nadimakhtar97
Copy link
Contributor Author

I just pushed, I think we should be good

Thanks again

@codecov
Copy link

codecov bot commented Sep 21, 2020

Codecov Report

Merging #8418 into main will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #8418   +/-   ##
=======================================
  Coverage   81.89%   81.89%           
=======================================
  Files         101      101           
  Lines        5900     5900           
=======================================
  Hits         4832     4832           
  Misses       1068     1068           
Impacted Files Coverage Δ
app/models/tag.rb 97.51% <ø> (ø)

@cesswairimu
Copy link
Collaborator

You are welcome and thanks for working on this 🎉 . We should be ready to merge once travis build is done

@nadimakhtar97
Copy link
Contributor Author

@cesswairimu can you please make me understand what mistake I did so that I don't do that again.

@cesswairimu
Copy link
Collaborator

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

@cesswairimu
Copy link
Collaborator

to be on the updated main, I recommend to always pull from upstream on the main branch then create your work branches from there

@nadimakhtar97
Copy link
Contributor Author

nadimakhtar97 commented Sep 21, 2020

By the way I am still stuck in my local repository with merge conflicts . How do I solve them? need help @cesswairimu .

Screenshot from 2020-09-22 00-04-49

@cesswairimu
Copy link
Collaborator

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 <HEAD> after this git add each file then run... git merge --continue

@cesswairimu cesswairimu merged commit be2d6c2 into publiclab:main Sep 22, 2020
@welcome
Copy link

welcome bot commented Sep 22, 2020

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to PublicLab.org in the next few days, but first it will be published to https://stable.publiclab.org/ (it will take some minutes for this to load, and until then you may see logs from the build process). Please test out your work on this testing server and report back with a comment that all has gone well!
Do join our weekly check-in to share your this week goal and the awesome work you did 😃. Please find the link pinned in the issue section 📝
Now that you've completed this, you can help someone else take their first step!
Reach out to someone else working on theirs on Public Lab's code welcome page (where you'll now be featured as a recent contributor!). Thanks!

Help others take their first step

Now that you've merged your first pull request, you're the perfect person to help someone else out with this challenging first step. 🙌

https://code.publiclab.org

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.

@cesswairimu
Copy link
Collaborator

Thanks for working on this 🎉 and welcome to PublicLab 🎈
Do let me know if your more conflicts when updating your main.

@nadimakhtar97
Copy link
Contributor Author

@cesswairimu @avats-dev where can I interact with the public lab's community?

@cesswairimu
Copy link
Collaborator

Hey you can find us all over here https://gitter.im/publiclab/publiclab 😃

@cesswairimu
Copy link
Collaborator

cesswairimu commented Sep 22, 2020

Also we have weekly check-ins where you can say hi, and ask for help if you are stuck
This week's check-in is here
#8419

piyushswain pushed a commit to piyushswain/plots2 that referenced this pull request Oct 22, 2020
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.

Add filter to remove spammed accounts from tag contributors listing
3 participants