gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-07-15 16:58:14 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge 0ece72dab0 into 5619099564

Browse Source
This commit is contained in:
Rachel H 2017-04-13 15:13:28 +00:00 committed by GitHub
commit 1a26f7bb90
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/components/status_content.jsx
View File

@ -92,7 +92,7 @@ const StatusContent = React.createClass({
const { status } = this.props;
const { hidden } = this.state;
const content = { __html: emojify(status.get('content')).replace(/\n/g, '') };
const content = { __html: emojify(status.get('content')) };
const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) };
const directionStyle = { direction: 'ltr' };

1
app/lib/formatter.rb
View File

@ -14,7 +14,6 @@ class Formatter
html = status.text
html = encode(html)
html = simple_format(html, {}, sanitize: false)
html = link_urls(html)
html = link_mentions(html, status.mentions)
html = link_hashtags(html)

1
config/application.rb
View File

@ -62,6 +62,7 @@ module Mastodon
config.middleware.use Rack::Attack
config.middleware.use Rack::Deflater
config.browserify_rails.source_map_environments << 'development'
config.browserify_rails.commandline_options = '--transform [ babelify --presets [ es2015 react ] ] --extension=".jsx"'
config.to_prepare do