remove obsolete apcu polyfill #17519
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -20,8 +20,6 @@ | |||
| "doctrine/common": "~2.4", | |||
| "twig/twig": "~1.23|~2.0", | |||
| "psr/log": "~1.0", | |||
| "symfony/security-acl": "~2.7", | |||
There was a problem hiding this comment.
This was a wrong merge in 67df429#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780
Not sure how we can prevent this from happening again and again.
There was a problem hiding this comment.
We can't AFAIK. There is no easy way to automate the knowledge that it should be reverted when merging in 3.0 IMO
There was a problem hiding this comment.
Merge without commit, then you can change the staged changes and commit (still a merge commit).
|
Thank you @Tobion. |
fabpot
added a commit
that referenced
this pull request
Jan 25, 2016
This PR was merged into the 3.0 branch. Discussion ---------- remove obsolete apcu polyfill | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - As @gapple pointed out in #17396 > APC is PHP <=5.4, so symfony/polyfill-apcu shouldn't be a dependency on 3.0 or master Commits ------- 5bf64ea remove obsolete apcu polyfill
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As @gapple pointed out in #17396