search

hashbang / admin-tools

Ansible playbooks and other admin tools used to administrate #! servers
MIT License
17 stars 10 forks source link

Add board members email alias #146

Closed drGrove closed 5 years ago

KellerFuchs commented 5 years ago

@drGrove As I said on IRC, I didn't merge this (as I had feedback left) but I think you accidentally pushed the first commit of the branch (8e2f92ea95d8d6929f71d001e2fbf541322ea7ea) to master.

I reverted that, rebased your entire branch (and squashed the first 2 commits together) so it wouldn't conflict with the revert, and activated branch protection on master so we can't accidentally push to it without PR anymore.

drGrove commented 5 years ago

Thanks @KellerFuchs, sorry about that

KellerFuchs commented 5 years ago

No problem :3

drGrove commented 5 years ago

@KellerFuchs ready for review

RyanSquared commented 5 years ago

It looks like this is a partial PR and that some earlier commits may have been pushed to master, based on the GitHub web UI's changelist.

drGrove commented 5 years ago

@RyanSquared this should be resolved now. Thanks for noticing!

drGrove commented 5 years ago

Ping @KellerFuchs @RyanSquared @lrvick

drGrove commented 5 years ago

@lrvick @DeviaVir @KellerFuchs can one of you merge this please?

drGrove commented 5 years ago

Actually @KellerFuchs I need you to approve this as well

KellerFuchs commented 5 years ago

@drGrove FWIW, you can dismiss someone's review if you handled their change request.

However, I took the opportunity to flatten the branch's history, as it was needlessly messy.

KellerFuchs commented 5 years ago

Lint failure is unrelated, you can go ahead and merge.