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.

Sign up for GitHub

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

Jump to bottom

[Tools] Enable PHPCS for detect_conflicts.php #6794

Merged
merged 2 commits into from
Aug 3, 2020
Merged

[Tools] Enable PHPCS for detect_conflicts.php #6794

merged 2 commits into from
Aug 3, 2020

Conversation

laemtl
Copy link
Contributor

@laemtl laemtl commented Jun 30, 2020

Replaces #5994

@laemtl laemtl mentioned this pull request Jun 30, 2020
Closed
@laemtl laemtl added State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) Testing PR contains test plan or automated test code (or config files for Travis) labels Jun 30, 2020
@laemtl laemtl changed the title 2020 01 20 phpcs detect conflicts.php [Tools] Enable PHPCS for detect_conflicts.php Jun 30, 2020
@laemtl laemtl added the State: Blocked PR or issue awaiting an external event such as the merge or another PR to proceed label Jul 8, 2020
@laemtl laemtl force-pushed the 2020-01-20_PHPCS-detect_conflicts.php branch from 436dcdd to 0a61bc0 Compare July 8, 2020 20:50
@laemtl laemtl removed State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) State: Blocked PR or issue awaiting an external event such as the merge or another PR to proceed labels Jul 8, 2020
@laemtl laemtl force-pushed the 2020-01-20_PHPCS-detect_conflicts.php branch from 0a61bc0 to 900a306 Compare July 8, 2020 23:09
@laemtl laemtl changed the base branch from master to main July 21, 2020 15:41
spell00
spell00 approved these changes Aug 3, 2020
View reviewed changes
Copy link
Contributor

@spell00 spell00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@driusan driusan merged commit b14d20a into aces:main Aug 3, 2020
@ridz1208 ridz1208 added this to the 24.0.0 milestone Aug 6, 2020
spell00 pushed a commit to spell00/Loris that referenced this pull request Aug 13, 2020
@laemtl @spell00
[Tools] Enable PHPCS for detect_conflicts.php (aces#6794)
ff9cfba 
Replaces aces#5994
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 15, 2021
@laemtl @AlexandraLivadas
[Tools] Enable PHPCS for detect_conflicts.php (aces#6794)
8d9d2f9 
Replaces aces#5994
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 29, 2021
@laemtl @AlexandraLivadas
[Tools] Enable PHPCS for detect_conflicts.php (aces#6794)
388a8ee 
Replaces aces#5994
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spell00 spell00 spell00 approved these changes

Assignees

@spell00 spell00

Labels
Testing PR contains test plan or automated test code (or config files for Travis)
Projects
None yet
Milestone
24.0.0
Development

Successfully merging this pull request may close these issues.
5 participants
@laemtl @spell00 @driusan @ridz1208 @johnsaigle