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

replace leaflet css/js files in editor rich #8087

Merged
merged 1 commit into from
Jul 7, 2020

Conversation

Tlazypanda
Copy link
Collaborator

Fixes #7923

Replaced leaflet css/js files in editor rich which are otherwise available from the asset pipeline.

  • 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

Thanks!

@Tlazypanda Tlazypanda requested a review from a team as a code owner June 29, 2020 14:08
@codecov
Copy link

codecov bot commented Jun 29, 2020

Codecov Report

Merging #8087 into main will decrease coverage by 0.56%.
The diff coverage is 37.20%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #8087      +/-   ##
==========================================
- Coverage   82.62%   82.05%   -0.57%     
==========================================
  Files          99      100       +1     
  Lines        5737     5773      +36     
==========================================
- Hits         4740     4737       -3     
- Misses        997     1036      +39     
Impacted Files Coverage Δ
app/controllers/application_controller.rb 92.30% <ø> (ø)
app/controllers/users_controller.rb 82.29% <ø> (ø)
app/mailers/admin_mailer.rb 90.90% <12.50%> (-9.10%) ⬇️
app/models/user.rb 86.44% <12.50%> (-4.61%) ⬇️
app/jobs/digest_spam_job.rb 33.33% <33.33%> (ø)
app/controllers/admin_controller.rb 80.00% <100.00%> (-1.86%) ⬇️
app/controllers/spam2_controller.rb 100.00% <100.00%> (ø)
app/controllers/tag_controller.rb 81.40% <100.00%> (ø)
app/services/execute_search.rb 88.88% <0.00%> (-5.56%) ⬇️
app/api/srch/search.rb 66.24% <0.00%> (-3.83%) ⬇️
... and 2 more

@Tlazypanda
Copy link
Collaborator Author

@cesswairimu @jywarren can you kindly review? Thanks ✌️

@jywarren jywarren changed the base branch from master to main June 30, 2020 18:18
@jywarren jywarren closed this Jul 7, 2020
@jywarren jywarren reopened this Jul 7, 2020
@jywarren
Copy link
Member

jywarren commented Jul 7, 2020

Hmm. @Tlazypanda would you mind trying to look in the Travis logs to see what happened here? Thank you!

@Tlazypanda
Copy link
Collaborator Author

Hey @jywarren the test failing is the Tag Selection test thing which i think is unrelated 😅

@jywarren
Copy link
Member

jywarren commented Jul 7, 2020

Hmm. Let's log this at #7315 -- i'll try restarting one more time...

@jywarren
Copy link
Member

jywarren commented Jul 7, 2020

Yay! OK but still tracking at #7315.

@jywarren jywarren merged commit 8a290c4 into publiclab:main Jul 7, 2020
@jywarren
Copy link
Member

jywarren commented Jul 7, 2020

Great!!! Thank you!!!

Tristan-Elizabeth pushed a commit to Tristan-Elizabeth/plots2 that referenced this pull request Jul 21, 2020
dms-yondy pushed a commit to dms-yondy/plots2 that referenced this pull request Aug 7, 2020
nadimakhtar97 pushed a commit to nadimakhtar97/plots2 that referenced this pull request Sep 21, 2020
shubhangikori pushed a commit to shubhangikori/plots2 that referenced this pull request Oct 12, 2020
alvesitalo pushed a commit to alvesitalo/plots2 that referenced this pull request Oct 14, 2020
piyushswain pushed a commit to piyushswain/plots2 that referenced this pull request Oct 22, 2020
manchere pushed a commit to manchere/plots2 that referenced this pull request Feb 13, 2021
lagunasmel pushed a commit to lagunasmel/plots2 that referenced this pull request Mar 2, 2021
ampwang pushed a commit to ampwang/plots2 that referenced this pull request Oct 26, 2021
billymoroney1 pushed a commit to billymoroney1/plots2 that referenced this pull request Dec 28, 2021
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.

Replace leaflet files in app/views/editor/rich.html.erb
2 participants