Skip to content

Commit

Permalink
Merge pull request #196 from lemberg/task/149-t2l-comments
Browse files Browse the repository at this point in the history
Use forked version of consolidation/comments: t2l/comments
  • Loading branch information
T2L committed Apr 27, 2020
2 parents b6968a8 + 25491fc commit d0df7dd
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 63 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Updates:

- [GH-149](https://github.com/lemberg/draft-environment/issues/149) - Use forked version of `consolidation/comments`: `t2l/comments`
- [GH-193](https://github.com/lemberg/draft-environment/issues/193) - Update all Ansible roles:
* oefenweb.swapfile (v2.0.24 => v2.0.26)
* geerlingguy.mysql (3.0.0 => 3.1.0)
Expand Down
10 changes: 2 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"require": {
"php": "^7.2",
"composer-plugin-api": "^1.1",
"consolidation/comments": "dev-patch-1",
"nette/robot-loader": "^3.2",
"symfony/filesystem": "^3.4 || ^4.4 || ^5",
"symfony/yaml": "^3.4 || ^4.4 || ^5"
"symfony/yaml": "^3.4 || ^4.4 || ^5",
"t2l/comments": "^1.1.0"
},
"require-dev": {
"composer/composer": "^1.10",
Expand Down Expand Up @@ -50,12 +50,6 @@
"Lemberg\\Tests\\Unit\\Draft\\Environment\\": "tests/Unit"
}
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/T2L/comments.git"
}
],
"minimum-stability": "dev",
"prefer-stable": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@
"description": "Test project that using lemberg/draft-environment",
"license": "GPL-2.0-or-later",
"require-dev": {
"lemberg/draft-environment": "3.x.x-dev#5fc08040bdf0a0b1003e792b5d5170b6a60750c7"
},
"repositories": {
"comments": {
"type": "vcs",
"url": "https://github.com/T2L/comments.git"
}
"consolidation/comments": "dev-master as dev-patch-1",
"lemberg/draft-environment": "3.x.x-dev"
},
"minimum-stability": "dev",
"prefer-stable": true
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
"require-dev": {
"lemberg/draft-environment": "3.0.0-beta4"
},
"repositories": {
"comments": {
"type": "vcs",
"url": "https://github.com/T2L/comments.git"
}
},
"minimum-stability": "dev",
"prefer-stable": true
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
"require-dev": {
"lemberg/draft-environment": "@dev"
},
"repositories": {
"comments": {
"type": "vcs",
"url": "https://github.com/T2L/comments.git"
}
},
"minimum-stability": "dev",
"prefer-stable": true
}

0 comments on commit d0df7dd

Please sign in to comment.