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

Changed http to https in notify_moderators_of_comment_spam.html.erb (#8587) #8593

Merged
merged 2 commits into from
Dec 17, 2020

Conversation

amanda-ariyaratne
Copy link
Contributor

@amanda-ariyaratne amanda-ariyaratne commented Oct 16, 2020

Changed http to https.

Fixes #8631 (<=== 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!

@welcome
Copy link

welcome bot commented Oct 16, 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 Oct 16, 2020

@codecov
Copy link

codecov bot commented Oct 16, 2020

Codecov Report

❗ No coverage uploaded for pull request base (main@dddc3e7). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #8593   +/-   ##
=======================================
  Coverage        ?   81.90%           
=======================================
  Files           ?      100           
  Lines           ?     5941           
  Branches        ?        0           
=======================================
  Hits            ?     4866           
  Misses          ?     1075           
  Partials        ?        0           

@amanda-ariyaratne
Copy link
Contributor Author

@noi5e I would like if someone can review my pull request. Thank you.

@@ -17,7 +17,7 @@
<hr>
<div class="footer">

<p>Visit the spam page here: <a href="http://publiclab.org/spam">http://publiclab.org/spam</a></p>
<p>Visit the spam page here: <a href="https://publiclab.org/spam">https://publiclab.org/spam</a></p>
Copy link
Member

Choose a reason for hiding this comment

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

Great catch! Thanks!

Actually i'll suggest something even more - see how we can fetch the hostname and insert it, in case this codebase is ever run on a different domain name?

From line 22:

Suggested change
<p>Visit the spam page here: <a href="https://publiclab.org/spam">https://publiclab.org/spam</a></p>
<p>Visit the spam page here: <a href="https://<%= ActionMailer::Base.default_url_options[:host] %>/spam">https://<%= ActionMailer::Base.default_url_options[:host] %>/spam</a></p>

It's a little harder to read, but what do you think?

Copy link
Contributor Author

@amanda-ariyaratne amanda-ariyaratne Oct 16, 2020

Choose a reason for hiding this comment

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

Yes, it is a bit harder to read. But if it is okay, I can change it.

Copy link
Contributor

@RuthNjeri RuthNjeri left a comment

Choose a reason for hiding this comment

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

Looks good to me @amanda-ariyaratne

@amanda-ariyaratne
Copy link
Contributor Author

@RuthNjeri Sorry I'm new to this. Is there anything for me to do next?

@RuthNjeri
Copy link
Contributor

Hi, @amanda-ariyaratne not really, all you have to do is wait for the maintainers to approve and merge...

@amanda-ariyaratne
Copy link
Contributor Author

great, thanks!

@cesswairimu
Copy link
Collaborator

restarting travis

@cesswairimu cesswairimu reopened this Oct 26, 2020
@gitpod-io
Copy link

gitpod-io bot commented Oct 26, 2020

@cesswairimu
Copy link
Collaborator

restarting travis

@cesswairimu cesswairimu reopened this Nov 23, 2020
@gitpod-io
Copy link

gitpod-io bot commented Nov 23, 2020

@cesswairimu
Copy link
Collaborator

I will try and rebase this branch

@cesswairimu
Copy link
Collaborator

That worked 🎉

Copy link
Collaborator

@cesswairimu cesswairimu 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 working on this 🎉 and sorry this took a while

@cesswairimu
Copy link
Collaborator

cesswairimu commented Nov 23, 2020

@jywarren kindly do another review on this we have a pending "changes requested". Thanks

@gitpod-io
Copy link

gitpod-io bot commented Dec 17, 2020

Hostname is loaded from configuration file instead of hardcoded hostname
@codeclimate
Copy link

codeclimate bot commented Dec 17, 2020

Code Climate has analyzed commit f4f5ad7 and detected 0 issues on this pull request.

View more on Code Climate.

@cesswairimu cesswairimu dismissed jywarren’s stale review December 17, 2020 09:16

Changes requested were fixed. Thanks Jeff

@cesswairimu cesswairimu merged commit 8bb0cf7 into publiclab:main Dec 17, 2020
@welcome
Copy link

welcome bot commented Dec 17, 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 all 🎉

manchere pushed a commit to manchere/plots2 that referenced this pull request Feb 13, 2021
…ubliclab#8587) (publiclab#8593)

* Update notify_moderators_of_comment_spam.html.erb

Changed http to https

* Hostname update in notify_moderators_of_comment_spam.html.erb

Hostname is loaded from configuration file instead of hardcoded hostname
lagunasmel pushed a commit to lagunasmel/plots2 that referenced this pull request Mar 2, 2021
…ubliclab#8587) (publiclab#8593)

* Update notify_moderators_of_comment_spam.html.erb

Changed http to https

* Hostname update in notify_moderators_of_comment_spam.html.erb

Hostname is loaded from configuration file instead of hardcoded hostname
reginaalyssa pushed a commit to reginaalyssa/plots2 that referenced this pull request Oct 16, 2021
…ubliclab#8587) (publiclab#8593)

* Update notify_moderators_of_comment_spam.html.erb

Changed http to https

* Hostname update in notify_moderators_of_comment_spam.html.erb

Hostname is loaded from configuration file instead of hardcoded hostname
billymoroney1 pushed a commit to billymoroney1/plots2 that referenced this pull request Dec 28, 2021
…ubliclab#8587) (publiclab#8593)

* Update notify_moderators_of_comment_spam.html.erb

Changed http to https

* Hostname update in notify_moderators_of_comment_spam.html.erb

Hostname is loaded from configuration file instead of hardcoded hostname
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.

Change http to https in notify_moderators_of_comment_spam.html.erb
4 participants