Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing Whitelist and Blacklist from sync (GH-1138) #98

Merged
merged 2 commits into from Jun 11, 2018
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
Linting.
  • Loading branch information
zarembsky committed Jun 11, 2018
commit 8a977dde11ea25a76f1e8dc693ca6d2c543d8f0e
@@ -740,8 +740,8 @@ function onMessageHandler(request, sender, callback) {
utils.getActiveTab((tab) => {
if (tab && tab.id && tab.url.startsWith('http')) {
const settings = accounts.buildUserSettings();
//Blacklisted and whitelisted sites are removed from sync array,
//but we want to allow export and import these properties manually
// Blacklisted and whitelisted sites are removed from sync array,
// but we want to allow export and import these properties manually
settings.site_blacklist = conf.site_blacklist;
settings.site_whitelist = conf.site_whitelist;

ProTip! Use n and p to navigate between commits in a pull request.