-
-
Notifications
You must be signed in to change notification settings - Fork 141
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
Merge 3.x manually #349
Merged
OskarStark
merged 35 commits into
sonata-project:master
from
greg0ire:merge_3.x_manually
Dec 22, 2016
Merged
Merge 3.x manually #349
OskarStark
merged 35 commits into
sonata-project:master
from
greg0ire:merge_3.x_manually
Dec 22, 2016
Conversation
This file contains 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
Added documentation for testing
…7lDK Applied fixes from StyleCI
This should reduce conflicts, and make diffs easier to read.
…feature/blocks-bc Revert "Deprecate BaseBlockService and BlockAdminServiceInterface"
This should help people figure out what is going on, see http://stackoverflow.com/questions/40101753/deprecated-warnings-when-using-sonata-admin-bundle
…on_messages Improve deprecation messages
…ore-files Cleanup .gitignore file
Add italian translation
greg0ire
force-pushed
the
merge_3.x_manually
branch
from
December 18, 2016 19:35
2ce03a8
to
fdf8cf0
Compare
8 tasks
Hmmmm… it fails for php 5.5. Which shouldn't even be built. But I guess it is still built because dev-kit couldn't deploy because… other conflicts? |
Let's try removing old php versions support manually then… |
greg0ire
force-pushed
the
merge_3.x_manually
branch
from
December 18, 2016 19:54
043e95f
to
cf0c000
Compare
ping @sonata-project/contributors |
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.
I am targetting this branch, because this is a merge.
Refs sonata-project/dev-kit#221
Changelog