Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Switch to more inclusive language #15188

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

alb
Copy link

@alb alb commented Jul 19, 2020

This pull requests implements the changes suggested in #15176.

Replaced:

  • blacklist with blocklist
  • whitelist with allow-list
  • slave with subordinate

@jha-G @narayani28 please review

@alb
Copy link
Author

alb commented Jul 19, 2020

It appears the build failed due to an issue with phantomjs not installing. This doesn't appear to be an issue with the pull request but rather how phantomjs is being installed.

npm ERR! [email protected] install: `node install.js`

npm ERR! Exit status 1

npm ERR! 

npm ERR! Failed at the [email protected] install script 'node install.js'.

npm ERR! Make sure you have the latest version of node.js and npm installed.

npm ERR! If you do, this is most likely a problem with the phantomjs package,

npm ERR! not with npm itself.

npm ERR! Tell the author that this fails on your system:

npm ERR!     node install.js

npm ERR! You can get information on how to open an issue for this project with:

npm ERR!     npm bugs phantomjs

npm ERR! Or if that isn't available, you can get their info via:

npm ERR!     npm owner ls phantomjs

npm ERR! There is likely additional logging output above.

npm ERR! Please include the following file with any support request:

npm ERR!     /home/travis/build/adobe/brackets/npm-debug.log

npm ERR! code 1

The command "eval npm install  " failed 3 times.

The command "npm install " failed and exited with 1 during .

@ferdnyc
Copy link

ferdnyc commented Jul 20, 2020

(Disclaimer: I'm not a project developer or... well, anyone, really, in the context of the Brackets codebase. So, my butting-in carries less than no weight here. Feel free to ignore me completely.)

Might be worth squashing the branch, @alb — no reason a change like this has to happen across two separate commits.

Changed to more fitting replacement
@alb
Copy link
Author

alb commented Jul 20, 2020

@ferdnyc thanks for the advice 😄 I have squashed the branch, according to your advice.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants