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 hostname value to display the correct embed code #7229

Merged
merged 1 commit into from
Jan 16, 2020

Conversation

NitinBhasneria
Copy link
Collaborator

@NitinBhasneria NitinBhasneria commented Jan 14, 2020

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

@codecov
Copy link

codecov bot commented Jan 14, 2020

Codecov Report

Merging #7229 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #7229   +/-   ##
======================================
  Coverage    81.5%   81.5%           
======================================
  Files          97      97           
  Lines        5602    5602           
======================================
  Hits         4566    4566           
  Misses       1036    1036

Copy link
Member

@Uzay-G Uzay-G 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 opening a pull request @NitinBhasneria! This is great

@@ -97,6 +97,7 @@
include: layersname,
hash: false,
embed: true,
hostname: 'publiclab.org',
Copy link
Member

Choose a reason for hiding this comment

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

Ah, can we ask @crisner to approve this? Thank you!!!

Copy link
Contributor

@crisner crisner left a comment

Choose a reason for hiding this comment

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

@jywarren, I'll also add what this change does.

Adding hostname here would change the embed code in https://publiclab.org/map#lat=22.51255695405145&lon=9.843750000000002 page from //publiclab.github.io/map/#lat=22.51255695405145&lon=9.843750000000002 to //publiclab.org/map/#lat=22.51255695405145&lon=9.843750000000002.

@NitinBhasneria
Copy link
Collaborator Author

@jywarren can I know why this "merging is blocked" showing?

@crisner
Copy link
Contributor

crisner commented Jan 16, 2020

@NitinBhasneria, it appears as "merging is blocked" to unauthorized users. It means you don't have the permissions to merge the PR to the master branch.

@jywarren
Copy link
Member

Ok, this is super, let's merge!!! 🙌🏽

@jywarren jywarren merged commit 46af803 into publiclab:master Jan 16, 2020
vinitshahdeo pushed a commit to vinitshahdeo/plots2 that referenced this pull request Feb 1, 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 hostname value to display the correct embed code
4 participants