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.

Sign up for GitHub

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

Jump to bottom

Merge 2.0 branch into master #1201

Merged
merged 72 commits into from
Aug 9, 2019
Merged

Merge 2.0 branch into master #1201

merged 72 commits into from
Aug 9, 2019

Conversation

franmomu
Copy link
Contributor

@franmomu franmomu commented Aug 6, 2019

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

This is like #1199, merging 2.0 branch into master so lost commits are recovered in master as well

robfrawley and others added 30 commits May 21, 2017 16:31
@robfrawley
change symfony kernel version comparison mechanism
46c7db1
@robfrawley
code style fixes
6cef67f
@robfrawley
remove symfony 3.3 from allowed failures
4c313a2
@makasim
[enqueue] Improve doc.
251006a
@makasim
Merge pull request #942 from formapro-forks/enqueue-doc
73c780c 
[enqueue] Improve doc.
@robfrawley
move to trusty for travis except for php 5.3
6857ef5
@cedricziel
Merge pull request #945 from robfrawley/bugfix-travis
d586411 
Move to trusty for travis except for php 5.3
Typo at log message
a045553
@imanalopher
return filter function String
f57164f
@cedricziel
Merge pull request #951 from imanalopher/1.0
6e43896 
return filter function String
@cedricziel
Merge pull request #947 from you-ser/1.0
5c9c7e8 
Typo at log message
@cedricziel
Merge pull request #940 from robfrawley/feature-remove-symfony-33-fro…
45835f4 
…m-allowed-failures

Remove Symfony 3.3 from allowed failures
@robfrawley
add chain loader implementation
6e8ec6d
@cedricziel
Merge pull request #953 from robfrawley/feature-add-chain-data-loader
6e1be77 
Add chain loader implementation
@robfrawley
add chain loader documentation
2301d94
@cedricziel
Merge pull request #957 from robfrawley/feature-document-chain-loader
ef1d95a 
Add chain loader documentation
@robfrawley
add support for latest imagine library version 0.7.0
6d82293
@robfrawley
Merge pull request #939 from robfrawley/feature-use-version-id-instea…
f65a530 
…d-of-version-numbers

Use simplified Symfony version comparison operation and CS fixes
@robfrawley
add resample filter implementation
309690d
@alexwilson
Merge pull request #958 from robfrawley/feature-use-latest-imagine-lib
c13bb62 
[Composer] Allow imagine-library version 0.7.0
@rpkamp @robfrawley
Pass roots to LocatorInterface directly instead
52eeb9b 
- Allow construction of Locator without data roots for BC
- Mark FilesystemLocator::setOptions deprecated
@robfrawley
cleanup of pr
2dffd96
Modify some PHP Annotations
5e321d2
@robfrawley
enable functional testing of resample filter with both imagick and gm…
22d874c 
…agick
@robfrawley
add comment about supported method signitures for FileSystemLoader::_…
23e79a7 
…_construct()
@lstrojny
Allow to configure the HTTP response code for redirects
39a3c14
@cmodijk
Added support for centerright and centerleft position to the Backgrou…
3413e7c 
…ndFilterLoader
@cedricziel
Merge pull request #965 from imanalopher/1.0
a4fd34a 
Modify some PHP Annotations
@cedricziel
Merge pull request #974 from JCID/patch-1
8e636c6 
Added support for centerright and centerleft position
@cmodijk
Updated the docs for #974
145133a
lsmith77 and others added 18 commits January 20, 2018 11:48
@lsmith77
Merge pull request #1026 from bruno-ds/patch-1
153808a 
Update png-quant.rst
@lsmith77
Merge pull request #996 from bocharsky-bw/patch-1
44ea861 
Fix nested level of bucket parameter
@peter-gribanov
Merge remote-tracking branch 'liip/1.0' into 1.0
82ce051
@peter-gribanov
Merge branch '1.0' into fixed_filter
28bdb71
@peter-gribanov
add docs for fixed size filter
9377ac0
@auipga
fix annotation
7cb259a
@cedricziel
Just use inheritdoc tag
376139c
@maximgubar
Merge pull request #1072 from auipga/patch-1
199cc53 
fix annotation
@maximgubar
Merge pull request #1015 from peter-gribanov/fixed_filter
d24e34c 
[Filter] Add "fixed-size" filter implementation
@welcoMattic
Replace app/console with bin/console
6440590
@robfrawley
Merge pull request #1157 from welcoMattic/patch-1
441c9db 
Replace app/console with bin/console
@ThomasLandauer @dbu
Updated Dynamic filters (#1161)
647d51e 
* Updated Dynamic filters

* Added info about autowiring. This is the most important part - took me some time to figure it out.
* "Moved" sample code from a controller to a service
* Deleted info about outdated Symfony 2.4
@franmomu
Merge branch '1.0' into merge_from_1_to_2
6683cac
@franmomu
fix tests
33c290f
@franmomu
apply cs fixer
db8c347
@franmomu
increase phpunit-bridge dependecy to 4.2
fe8a2f0
@dbu
Merge pull request #1199 from franmomu/merge_from_1_to_2
715e567 
Upgrade 2.0 from 1.0
@franmomu
Merge branch '2.0' into merge_2_into_master
c3afb2e
@franmomu franmomu closed this Aug 6, 2019
@franmomu franmomu reopened this Aug 6, 2019
@dbu
Copy link
Member

dbu commented Aug 6, 2019

i am confused by the branches in this repository. master currently only has the alias that 1.0-dev is version 1, but has no alias for what the master branch should see. if master is 2.x, we should not have a 2.0 branch. if master is 1.x we should not have had the 1.0 branch and should rather merge 1.0 to master than merge 2.0 to master.

note that there is no release of version 2 yet, so master can't mean 3.x. @lsmith77 or @michellesanver can one of you help us out here and clarify this?

@lsmith77
Copy link
Contributor

lsmith77 commented Aug 6, 2019

@maximgubar might remember the details .. but afaik 2.0 was used to prepare the 2.0 release .. after the 2.0 release, master became the source for 2.0 releases .. but I am not 100% sure

@dbu
Copy link
Member

dbu commented Aug 6, 2019

oh, i overlooked the 2.0.0 and 2.1.0 releases because older tags use the v prefix. does 2.0 to master have other differences than what you added from 1.0 @franmomu ? if master has no BC breaks versus 2, i suggest we merge this and then remove the 2.0 branch to avoid confusion.

and imho there should be a branch alias for dev-master: 2.x if master represents version 2.

@franmomu
Copy link
Contributor Author

franmomu commented Aug 6, 2019

oops I thought 2.0 branch was for 2.x releases. Apart from the changes from 1.0, here are included a couple of commits (6440590 and 647d51e) that are in 2.0 and not in master

@dbu
Copy link
Member

dbu commented Aug 9, 2019

looking at 2.0...master there seem to be cs cleanups and one big new feature, the configuration model classes. i don't think they are a BC break, so imho we can merge this and then remove the 2.0 branch for clarity. wdyt @michellesanver ?

@michellesanver
Copy link
Contributor

Sounds like a perfect plan! :)

@michellesanver michellesanver merged commit cbed335 into liip:master Aug 9, 2019
@franmomu franmomu deleted the merge_2_into_master branch August 13, 2019 06:26
@robfrawley robfrawley mentioned this pull request Oct 4, 2019
Merged
@franmomu franmomu mentioned this pull request Oct 4, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet