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

4.1.1 -> 4.x #10698

Merged
merged 4 commits into from
Dec 20, 2021
Merged

4.1.1 -> 4.x #10698

merged 4 commits into from
Dec 20, 2021

Conversation

escopecz
Copy link
Sponsor Member

@escopecz escopecz commented Dec 20, 2021

Merging changes in 4.1.1 into 4.x

kathrin-schmid and others added 4 commits December 17, 2021 14:02
The button that i updated is for saving changes made in the "Edit code" window and should thus say "Save", not "Edit".
…#10697)

* Fixes issue #10453

* Adding functional test covering the bug

#10453

Co-authored-by: Rolando <rpayanm@gmail.com>
@cla-bot cla-bot bot added the cla-signed The PR contributors have signed the contributors agreement label Dec 20, 2021
@codecov
Copy link

codecov bot commented Dec 20, 2021

Codecov Report

Merging #10698 (9414f39) into 4.x (5975231) will increase coverage by 0.34%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##                4.x   #10698      +/-   ##
============================================
+ Coverage     44.23%   44.57%   +0.34%     
- Complexity    34806    35025     +219     
============================================
  Files          2080     2080              
  Lines        116691   117530     +839     
============================================
+ Hits          51615    52386     +771     
- Misses        65076    65144      +68     
Impacted Files Coverage Δ
app/bundles/FormBundle/Form/Type/FormType.php 97.26% <ø> (ø)
...dles/LeadBundle/Controller/EntityContactsTrait.php 75.64% <0.00%> (-1.78%) ⬇️
app/bundles/LeadBundle/Entity/LeadEventLog.php 86.11% <0.00%> (-1.70%) ⬇️
.../bundles/CoreBundle/Helper/Chart/AbstractChart.php 73.52% <0.00%> (-1.48%) ⬇️
app/bundles/LeadBundle/Entity/ListLead.php 73.75% <0.00%> (+0.83%) ⬆️
app/bundles/FormBundle/Model/FormModel.php 71.08% <0.00%> (+1.30%) ⬆️
...p/bundles/LeadBundle/Controller/ListController.php 41.03% <0.00%> (+1.91%) ⬆️
...s/LeadBundle/Entity/CustomFieldRepositoryTrait.php 87.23% <0.00%> (+2.15%) ⬆️
.../Stat/ChartQuery/SegmentContactsLineChartQuery.php 100.00% <0.00%> (+2.73%) ⬆️
app/bundles/CoreBundle/Entity/CommonRepository.php 71.59% <0.00%> (+3.08%) ⬆️
... and 5 more

@escopecz escopecz changed the title 4.1 4.1.1 -> 4.x Dec 20, 2021
@RCheesley
Copy link
Sponsor Member

When I tried to test this in Gitpod I get an error:

gitpod /workspace/mautic $ ddev start
Starting mautic...
services.web.extra_hosts array items[0,1] must be unique
Failed to start mautic: ComposeCmd failed to run 'COMPOSE_PROJECT_NAME=ddev-mautic docker-compose -f /workspace/mautic/.ddev/.ddev-docker-compose-full.yaml up --build -d', action='[up --build -d]', err='exit status 15', stdout='', stderr='services.web.extra_hosts array items[0,1] must be unique'

Will try to pull it down locally and test there.

@RCheesley
Copy link
Sponsor Member

Tested locally, all seems good to go.

@RCheesley RCheesley added the chore Tasks that relate to maintaining this Github repository label Dec 20, 2021
@RCheesley RCheesley merged commit 2e9707d into 4.x Dec 20, 2021
shinde-rahul pushed a commit to shinde-rahul/mautic that referenced this pull request Feb 2, 2022
* Update language string (mautic#10684)

The button that i updated is for saving changes made in the "Edit code" window and should thus say "Save", not "Edit".

* Fixes 500 error in forms when render style is deactivated against 4.1 (mautic#10697)

* Fixes issue mautic#10453

* Adding functional test covering the bug

mautic#10453

Co-authored-by: Rolando <rpayanm@gmail.com>

* Fixing issues when using PHPSTAN with more processes (mautic#10696)

* Bumping to version 4.1.1

Co-authored-by: Kathrin Schmid <96054002+kathrin-schmid@users.noreply.github.com>
Co-authored-by: Rolando <rpayanm@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Tasks that relate to maintaining this Github repository cla-signed The PR contributors have signed the contributors agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants