Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

[FrameworkBundle] fix merge of 3.3 into 3.4 #25510

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

Merged
merged 1 commit into from
Dec 15, 2017

Conversation

dmaicher
Copy link
Contributor

Q A
Branch? 3.4
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -
License MIT
Doc PR -

In 3.4+ there were tests for disabled esi/ssi already so now they have been duplicated by merging #25489 up from 2.7

This just cleans up the duplication.

@nicolas-grekas
Copy link
Member

Thank you @dmaicher.

@nicolas-grekas nicolas-grekas merged commit 76e16ff into symfony:3.4 Dec 15, 2017
nicolas-grekas added a commit that referenced this pull request Dec 15, 2017
This PR was merged into the 3.4 branch.

Discussion
----------

[FrameworkBundle] fix merge of 3.3 into 3.4

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

In 3.4+ there were tests for disabled esi/ssi already so now they have been duplicated by merging #25489 up from 2.7

This just cleans up the duplication.

Commits
-------

76e16ff [FrameworkBundle] fix merge of 3.3 into 3.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
Morty Proxy This is a proxified and sanitized view of the page, visit original site.