logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 233506f6c1b0b16ca62c557ae6eca4a585e28a2c
parent: 0fc7cbfa2462cfc025f6d218f02649693a71f677
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Tue, 21 May 2019 18:27:43 +0000

Merge branch 'fix-pipelines' into 'develop'

Fix pipelines and clean up console output

See merge request pleroma/pleroma-fe!804

Diffstat:

Mbuild/utils.js4+---
Mbuild/webpack.prod.conf.js2--
Mtest/unit/specs/services/entity_normalizer/entity_normalizer.spec.js4++--
3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/build/utils.js b/build/utils.js @@ -58,7 +58,5 @@ exports.cssLoaders = function (options) { // Generate loaders for standalone style files (outside of .vue) exports.styleLoaders = function (options) { - var output = exports.cssLoaders(options) - console.log(output) - return output + return exports.cssLoaders(options) } diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js @@ -14,8 +14,6 @@ let commitHash = require('child_process') .execSync('git rev-parse --short HEAD') .toString(); -console.log(commitHash) - var webpackConfig = merge(baseWebpackConfig, { mode: 'production', module: { diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js @@ -322,9 +322,9 @@ describe('API Entities normalizer', () => { describe('MastoAPI emoji adder', () => { const emojis = makeMockEmojiMasto() - const imageHtml = '<img src="https://example.com/image.png" alt="image" class="emoji" />' + const imageHtml = '<img src="https://example.com/image.png" alt="image" title="image" class="emoji" />' .replace(/"/g, '\'') - const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" class="emoji" />' + const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" title="thinking" class="emoji" />' .replace(/"/g, '\'') it('correctly replaces shortcodes in supplied string', () => {