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

Revert #4651 for 2.3 branch #4746

Merged
merged 1 commit into from
Jan 16, 2015
Merged

Revert #4651 for 2.3 branch #4746

merged 1 commit into from
Jan 16, 2015

Conversation

xelaris
Copy link
Contributor

@xelaris xelaris commented Jan 3, 2015

Q A
Doc fix? yes
New docs? no
Applies to 2.3 (only)
Fixed tickets
#4651 was merged in 2.3 but should be 2.5 as mentioned in #4651 (comment). This PR reverts the changes for the 2.3 branch.

@xabbuh
Copy link
Member

xabbuh commented Jan 4, 2015

👍 They should then be added back again after this has been merged up into the 2.5 branch.

@xelaris
Copy link
Contributor Author

xelaris commented Jan 4, 2015

Before adding the Checking for Known Security Vulnerabilities in Dependencies paragraph back to book/security.rst, maybe a decision should be made if this is the best place for it (see #4745).

@weaverryan weaverryan merged commit f2d3223 into symfony:2.3 Jan 16, 2015
weaverryan added a commit that referenced this pull request Jan 16, 2015
This PR was merged into the 2.3 branch.

Discussion
----------

Revert #4651 for 2.3 branch

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    |  2.3 (only)
| Fixed tickets |

#4651 was merged in 2.3 but should be 2.5 as mentioned in #4651 (comment). This PR reverts the changes for the 2.3 branch.

Commits
-------

f2d3223 Revert #4651 for 2.3 branch
@weaverryan
Copy link
Member

Ah yes my fault on the bad merge - thanks @xelaris for making this PR - it made my life very easy in fixing it. After merging 2.3 into 2.5, I reverted this commit on 2.5 at sha: 50946ca

About your last comment @xelaris, I'll follow up on #4745

Thanks!

wouterj added a commit that referenced this pull request Jan 31, 2015
This PR was merged into the 2.3 branch.

Discussion
----------

[Book][Security] Remove out-dated anchor

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3 (only)
| Fixed tickets |

I missed to remove the anchor along with the paragraph in PR #4746.

Commits
-------

dbbe9de [Book][Security] Remove out-dated anchor
@xelaris xelaris deleted the revert-4651 branch October 31, 2022 12:18
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.

3 participants