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.16.0 to 3.x #8441

Merged
merged 14 commits into from Feb 14, 2020
Merged

Merge 2.16.0 to 3.x #8441

merged 14 commits into from Feb 14, 2020

Conversation

escopecz
Copy link
Sponsor Member

Please be sure you are submitting this against the staging branch.

Q A
Bug fix?
New feature?
Automated tests included?
Related user documentation PR URL
Related developer documentation PR URL
Issues addressed (#s or URLs)
BC breaks?
Deprecations?

Description:

Merging changes that were added between the release of 2.16.0-beta and 2.16.0.
Plus composer update to resolve conflicts in composer.lock

Steps to test this PR:

  1. Load up this PR
  2. Make sure Mautic loads. The rest should be tested by individual PR testers.

Florian Wessels and others added 13 commits October 22, 2019 18:26
[BUGFIX] Reintroduce support for Apache < 2.4
0f34d7a
[TASK] Use more strict regex syntax
f807512
[TASK] Fix misspelling
b37a0d2
@alanhartless
Disable RSS notifications from mautic.com until there is a community …
9236d4b 
…replacement
@dennisameling
Merge pull request mautic#8412 from alanhartless/disable-mautic-com-r…
f7f6207 
…ss-feed

Disable RSS notifications from mautic.com until there is a community replacement
@dependabot
Bump symfony/security from 2.8.46 to 2.8.50
238b24b 
Bumps [symfony/security](https://github.com/symfony/security) from 2.8.46 to 2.8.50.
- [Release notes](https://github.com/symfony/security/releases)
- [Changelog](https://github.com/symfony/security/blob/4.4/CHANGELOG.md)
- [Commits](symfony/security@v2.8.46...v2.8.50)

Signed-off-by: dependabot[bot] <support@github.com>
@dennisameling
Merge pull request mautic#8431 from mautic/dependabot/composer/symfon…
d4ab33f 
…y/security-2.8.50

Bump symfony/security from 2.8.46 to 2.8.50
@dennisameling
Merge pull request mautic#7976 from flossels/bugfix/support-apache-22
0584377 
[BUGFIX] Reintroduce support for Apache < 2.4
issue-8432 / CookieHelper for PHP73
baf7a2f
issue-8432 / CookieHelper for PHP73 - option parameter
edbd83c
issue-8432 / CookieHelper for PHP73 - options
40d092a
@dennisameling
Merge pull request mautic#8436 from lukassykora/issue-8432-cookie-php73
752aff9 
Issue 8432 cookie php73
@escopecz
Merge remote-tracking branch 'upstream/staging' into merge-2.16.0-to-3.x
2f32adf
@escopecz escopecz added code-review-needed PR's that require a code review before merging essential This must be done to close the milestone Mautic 3 ready-to-test PR's that are ready to test labels Feb 13, 2020
@escopecz escopecz added this to the 3.0.0 milestone Feb 13, 2020
@escopecz escopecz added this to Needs code review and/or test in Mautic 3 Feb 13, 2020
@hluchas hluchas self-requested a review February 14, 2020 08:53
@hluchas
Copy link
Contributor

hluchas commented Feb 14, 2020 •
edited

You have to use 6232d7b
which is part of #8413

Mautic works locally. Not in the mautibox. I could be merged I think ;-)

hluchas
hluchas approved these changes Feb 14, 2020
View reviewed changes
Copy link
Contributor

@hluchas hluchas left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works 👍

You have to use 6232d7b
which is part of #8413

@escopecz escopecz merged commit 95d33b7 into mautic:3.x Feb 14, 2020
@escopecz escopecz removed code-review-needed PR's that require a code review before merging essential This must be done to close the milestone ready-to-test PR's that are ready to test labels Feb 14, 2020
@escopecz escopecz moved this from Needs code review and/or test to Done in Mautic 3 Feb 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hluchas hluchas hluchas approved these changes

@lukassykora lukassykora Awaiting requested review from lukassykora

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Mautic 3
  
Done
Milestone
3.0.0-beta
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@escopecz @hluchas @alanhartless @dennisameling