diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-05-21 18:27:43 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-05-21 18:27:43 +0000 |
| commit | 233506f6c1b0b16ca62c557ae6eca4a585e28a2c (patch) | |
| tree | efd450694038b5cbd65d4ae06ccdded3f38baaf3 | |
| parent | 0fc7cbfa2462cfc025f6d218f02649693a71f677 (diff) | |
| parent | 52475dbf23ee1ccee1c6cbc23cfd7b4af23dd8a9 (diff) | |
Merge branch 'fix-pipelines' into 'develop'
Fix pipelines and clean up console output
See merge request pleroma/pleroma-fe!804
| -rw-r--r-- | build/utils.js | 4 | ||||
| -rw-r--r-- | build/webpack.prod.conf.js | 2 | ||||
| -rw-r--r-- | test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/build/utils.js b/build/utils.js index 3beee774..b45ffc16 100644 --- 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 index e7d25bfe..ed11ebad 100644 --- 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 index bae890f8..3d34c5cc 100644 --- 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', () => { |