maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:thepracticaldev/dev.to_core

Browse source
This commit is contained in:
Ben Halpern 2018-05-01 13:34:15 -04:00
commit 0d60cb61e9
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/display_ad.rb
View file

@ -13,8 +13,8 @@ class DisplayAd < ApplicationRecord
markdown = Redcarpet::Markdown.new(renderer)
initial_html = markdown.render(body_markdown)
stripped_html = ActionController::Base.helpers.sanitize initial_html.html_safe,
tags: %w(a em i b u br img),
attributes: %w(href target src height width)
tags: %w(a em i b u br img h1 h2 h3 h4 div),
attributes: %w(href target src height width style)
html = stripped_html.gsub("\n","")
self.processed_html = MarkdownParser.new(html).prefix_all_images(html, 350)
end

30
app/views/articles/_sidebar.html.erb
View file

@ -266,6 +266,17 @@
</span>&gt;
</header>
<div class="widget-body">
<div class="sidebar-sponsor">
<a class="partner-link" href="https://pusher.com/?utm_source=dev.to&utm_medium=referral&utm_campaign=Devtocontest" target="_blank" data-details="pusher__image">
<img src="https://thepracticaldev.s3.amazonaws.com/i/oypi4t6d6sq7s7ujyak6.png" style="margin-bottom:8px;" />
</a>
<div class="sponsor-tagline" style="display:inline;">
Communication and collaboration APIs for app developers.
<a class="partner-link sponsor-learn-more" href="https://pusher.com/?utm_source=dev.to&utm_medium=referral&utm_campaign=Devtocontest" target="_blank" data-details="pusher__learn-more">
Learn More
</a>
</div>
</div>
<div class="sidebar-sponsor">
<a class="partner-link" href="https://try.digitalocean.com/performance/?utm_source=devto&utm_medium=display&utm_campaign=Devto_2018_Brand" target="_blank" data-details="digitalocean__image">
<img src="https://thepracticaldev.s3.amazonaws.com/i/85318v8gv77kzr8r2e58.png" style="margin-bottom:8px;" />
@ -278,27 +289,16 @@
</div>
</div>
<div class="sidebar-sponsor">
<a class="partner-link" href="https://flatironschool.com/?utm_campaign=Sponsored_Content&utm_source=Devto&utm_medium=homepage" target="_blank" data-details="flatiron__image">
<img src="https://thepracticaldev.s3.amazonaws.com/i/w4atocsq5q75vrn3mta7.jpg" />
<a class="partner-link" href="https://timber.io/?utm_source=devto&utm_medium=homepage&utm_campaign=devto_may" target="_blank" data-details="timber__image">
<img src="https://thepracticaldev.s3.amazonaws.com/i/wxyawe0x0ve0n7kmbzk5.png" />
</a>
<div class="sponsor-tagline">
Our web-based Intro to Javascript course is 100% free.
<a class="partner-link sponsor-learn-more" href="https://flatironschool.com/programs/online-intro-javascript-free-course/?utm_campaign=Sponsored_Content&utm_source=Dev.to&utm_medium=IJS">
Best in class logging for Node, Ruby and Elixir apps.
<a class="partner-link sponsor-learn-more" href="https://timber.io/?utm_source=devto&utm_medium=homepage&utm_campaign=devto_may" target="_blank" data-details="timber__learn-more">
Learn More
</a>
</div>
</div>
<div class="sidebar-sponsor">
<a class="partner-link" href="https://www.bugsnag.com/?utm_source=dev.to&utm_medium=cpc&utm_content=homepage_logo&utm_campaign=dev.to-2018-april" target="_blank" data-details="bugsnag__image">
<img src="https://thepracticaldev.s3.amazonaws.com/i/ly5o0199ic9mdw7dp5p0.png" />
</a>
<div class="sponsor-tagline">
Powerful error monitoring for web, mobile, and server apps.
<a class="partner-link sponsor-learn-more" href="https://www.bugsnag.com/?utm_source=dev.to&utm_medium=cpc&utm_content=homepage_logo&utm_campaign=dev.to-2018-april" target="_blank" data-details="bugsnag__learn-more">
Learn More
</a>
</div>
</div>
<div class="sponsors-love-message">
We are grateful for wonderful sponsors who help sustain the dev community.
</div>