search

scrapinghub / slackbot

A chat bot for Slack (https://slack.com).
MIT License
1.26k stars 396 forks source link

Change 'Private Group' terminology to 'Private Channel' #159

Closed DannyHinshaw closed 6 years ago

DannyHinshaw commented 6 years ago

Most all changes were made in the testing architecture, with a few changes in the CONTRIBUTING as well (for slackbot_test_settings.py setup)

Included backwards compatibility patch for TravisCI where environment variables may still be using the outdated 'SLACKBOT_TEST_GROUP'.

DannyHinshaw commented 6 years ago

Forgot to note that all tests pass for me both locally and with Travis (including with env var 'GROUP').

DannyHinshaw commented 6 years ago

Closed for committing un-squashed branch. Working on a new PR

jtatum commented 6 years ago

In the future, don't sweat it :) I tend to squash on merge anyhow. Also, you can use git rebase -i to squash commits on your branch, then do a push --force (while you never want to force push an active branch, it's just fine on a feature/topic branch).

DannyHinshaw commented 6 years ago

Cool, appreciate it. I actually thought I had done the rebase successfully until I looked at my PR, noticed it didn't take (probably didn't --force). Rebasing is still new to me so it was at least good practice haha. Thanks