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

Fix #11084 Add 'chronos' to unix_users.txt #11086

Closed
wants to merge 2 commits into from
Closed

Fix #11084 Add 'chronos' to unix_users.txt #11086

wants to merge 2 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Dec 8, 2018

This commit adds the username 'chronos' to the user list as it happens to be the default username on ChromeOS, as highlighted by @h00die in Issue #11084

Shreyans Doshi added 2 commits December 8, 2018 16:43
This commit adds the username 'chronos' to the user list as it happens to be the default username on ChromeOS, as highlighted by @h00die in Issue #11084
@bcoles
Copy link
Contributor

bcoles commented Dec 9, 2018

It is required that code in your fork be merged from a unique branch in your repository to master in Rapid7's. Please create a new branch in your fork of framework and resubmit this from that branch.

git checkout -b <BRANCH_NAME>
git push <your_fork_remote> <BRANCH_NAME>

This helps protect the process, ensure users are aware of commits on the branch being considered for merge, allows for a location for more commits to be offered without mingling with other contributor changes and allows contributors to make progress while a PR is still being reviewed.

Closing based on the this requirement, please do resubmit from a unique branch.

@bcoles bcoles closed this Dec 9, 2018
@h00die
Copy link
Contributor

h00die commented Dec 9, 2018

@bcook-r7 would it be possible to add the branch name check to travis or one of the other compatibility checkers? Seems like a simple check (or maybe put a warning in the PR template).

@ghost
Copy link
Author

ghost commented Dec 9, 2018

@bcook-r7 would it be possible to add the branch name check to travis or one of the other compatibility checkers? Seems like a simple check (or maybe put a warning in the PR template).

I can try to do this if you give me a day.

@ghost
Copy link
Author

ghost commented Dec 9, 2018

It is required that code in your fork be merged from a unique branch in your repository to master in Rapid7's. Please create a new branch in your fork of framework and resubmit this from that branch.

git checkout -b <BRANCH_NAME>
git push <your_fork_remote> <BRANCH_NAME>

This helps protect the process, ensure users are aware of commits on the branch being considered for merge, allows for a location for more commits to be offered without mingling with other contributor changes and allows contributors to make progress while a PR is still being reviewed.

Closing based on the this requirement, please do resubmit from a unique branch.
I am so sorry about this. I will fix it and it will never happen again.

@busterb
Copy link
Member

busterb commented Dec 9, 2018

@h00die The PR template is easy to tweak, it's just the contents of .github/PULL_REQUEST_TEMPLATE.md

I'm sure how to ensure a pre-PR check in github though. If you can find a bot that can check this, maybe we could consider enabling that so people don't have to check it. Can houndci do it? I've been considering enabling that, since it can also do Ruby style checks easily enough (see https://github.com/busterb/metasploit-framework/pull/13/files for what the output looks like, and it can be tweaked)

@bcoles
Copy link
Contributor

bcoles commented Dec 9, 2018

I am so sorry about this. I will fix it and it will never happen again.

It's not a big deal. Thanks for the contribution!

@pedrib pedrib mentioned this pull request Jan 21, 2019
6 tasks
@pedrib pedrib mentioned this pull request Jan 30, 2019
6 tasks
@pedrib pedrib mentioned this pull request Feb 20, 2019
6 tasks
@pedrib pedrib mentioned this pull request Feb 24, 2019
6 tasks
@Mu-L Mu-L mentioned this pull request Mar 22, 2019
6 tasks
This was referenced May 10, 2019
@S0U1SB4N3 S0U1SB4N3 mentioned this pull request May 22, 2020
6 tasks
@alibaba-max alibaba-max mentioned this pull request Jun 7, 2020
6 tasks
@XZVB12 XZVB12 mentioned this pull request Jun 10, 2020
6 tasks
@pedrib pedrib mentioned this pull request Jun 12, 2020
6 tasks
@CrackerCat CrackerCat mentioned this pull request Jun 14, 2020
6 tasks
@276793422 276793422 mentioned this pull request Jun 21, 2020
6 tasks
This was referenced Jun 24, 2020
@pedrib pedrib mentioned this pull request Jun 25, 2020
6 tasks
@pedrib pedrib mentioned this pull request Jul 2, 2020
6 tasks
@itsecurityco itsecurityco mentioned this pull request Jul 6, 2020
5 tasks
@pedrib pedrib mentioned this pull request Jul 30, 2020
6 tasks
@276793422 276793422 mentioned this pull request Aug 6, 2020
6 tasks
@pedrib pedrib mentioned this pull request Aug 7, 2020
6 tasks
@anukaal anukaal mentioned this pull request Sep 4, 2020
6 tasks
@gwillcox-r7
Copy link
Contributor

@ole-h This is a long closed PR, there is no need to review this PR. Locking this PR as this issue has been resolved for over a year now.

@rapid7 rapid7 locked as resolved and limited conversation to collaborators Sep 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants