Fixes for GH-877, GH-872, GH-886, missing translations added. #9

zarembsky · 2018-03-20T17:34:58Z

[ x] Have you followed the guidelines in CONTRIBUTING.md?
[x ] Have you checked to ensure there aren't other open Pull Requests for the same update/change?
[ x] Have you added an explanation of what your changes do?
[x ] Does your submission pass tests?
[x ] Did you lint your code prior to submission?

jsignanini · 2018-03-20T18:31:35Z

src/utils/utils.js

+					if (chrome.runtime.lastError) {
+						log('insertCSS error', chrome.runtime.lastError);
+						reject(new Error(chrome.runtime.lastError));
+					}


@zarembsky add return; after this line to make sure we exit the function's execution please.

Serge Zarembsky added 3 commits Mar 20, 2018

Fix for GH-877, GH-886, GH-872.

bdcba81

Merge remote-tracking branch 'upstream/develop' into develop

765f56d

Removing log from manifest

Loading status checks…

95b400f

zarembsky requested a review from ghostery/ghostery as a code owner Mar 20, 2018

zarembsky requested a review from jsignanini Mar 20, 2018

jsignanini requested changes Mar 20, 2018

View changes

Added return after reject.

Loading status checks…

636c05c

jsignanini approved these changes Mar 20, 2018

View changes

jsignanini merged commit 9f88345 into ghostery:develop Mar 20, 2018
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

ghostery / ghostery-extension

Fixes for GH-877, GH-872, GH-886, missing translations added. #9

Fixes for GH-877, GH-872, GH-886, missing translations added. #9

zarembsky commented Mar 20, 2018

This comment has been minimized.

ghostery / ghostery-extension

Fixes for GH-877, GH-872, GH-886, missing translations added. #9

Fixes for GH-877, GH-872, GH-886, missing translations added. #9

Conversation

zarembsky commented Mar 20, 2018

This comment has been minimized.

jsignanini Mar 20, 2018 Member

jsignanini Mar 20, 2018
Member