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

Move website config to default branch #4305

Merged
merged 1 commit into from
Sep 29, 2020
Merged

Conversation

SenseException
Copy link
Member

Adapts the website config to be compatible with the doctrine/doctrine-website#356 changes

Q A
Type improvement
BC Break /no

greg0ire
greg0ire previously approved these changes Sep 27, 2020
@SenseException
Copy link
Member Author

SenseException commented Sep 28, 2020

I need to change the target branch for this PR. See #4309 (comment). Is it 2.11.x?

I'll rebase onto 2.11.x soon.

@SenseException SenseException changed the base branch from 3.0.x to 2.11.x September 28, 2020 17:51
@SenseException SenseException dismissed greg0ire’s stale review September 28, 2020 17:51

The base branch was changed.

@greg0ire
Copy link
Member

Yes sorry, I'm on my phone, see #4309 for details

Adapts the website config to be compatible with the doctrine/doctrine-website#356 changes
@SenseException SenseException force-pushed the default-branch-website-config branch from ec4caf4 to 4bf867f Compare September 28, 2020 18:08
@SenseException
Copy link
Member Author

@greg0ire Now it should fit as soon as 2.11.x is new default branch.

@greg0ire greg0ire requested a review from morozov September 28, 2020 20:46
Copy link
Member

@greg0ire greg0ire left a comment

Choose a reason for hiding this comment

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

LGTM, even if 3.0.x ends up staying the default branch, since we frequently merge things up.

@greg0ire greg0ire added this to the 2.11.2 milestone Sep 29, 2020
@greg0ire greg0ire merged commit 447225a into 2.11.x Sep 29, 2020
@greg0ire greg0ire deleted the default-branch-website-config branch September 29, 2020 19:28
@greg0ire
Copy link
Member

Thanks @SenseException !

@morozov morozov removed their request for review October 23, 2020 16:59
rgrellmann added a commit to Rossmann-IT/dbal that referenced this pull request Mar 7, 2021
Release [2.11.2](https://github.com/doctrine/dbal/milestone/81)

2.11.2
======

- Total issues resolved: **5**
- Total pull requests resolved: **16**
- Total contributors: **10**

Static Analysis
---------------

 - [4353: Update Psalm to 3.17.2 and lock the version used with GitHub Actions](doctrine#4353) thanks to @morozov
 - [4348: Bump Psalm level to 3](doctrine#4348) thanks to @morozov
 - [4332: Static analysis improvements](doctrine#4332) thanks to @morozov
 - [4319: Bump Psalm level to 4](doctrine#4319) thanks to @morozov

Code Style
----------

 - [4346: Minor CS improvement - use ::class for TestCase::expectException input](doctrine#4346) thanks to @mvorisek

 - [4344: Static analysis workflow](doctrine#4344) thanks to @greg0ire
 - [4340: Modernize existing ga](doctrine#4340) thanks to @greg0ire
 - [4309: Use cache action v2](doctrine#4309) thanks to @greg0ire
 - [4305: Move website config to default branch](doctrine#4305) thanks to @SenseException

Improvement,Prepared Statements
-------------------------------

 - [4341: Add Statement::fetchAllIndexedAssociative() and ::iterateIndexedAssociative()](doctrine#4341) thanks to @morozov and @ZaneCEO
 - [4338: Add Statement::fetchAllKeyValue() and ::iterateKeyValue()](doctrine#4338) thanks to @morozov

BC Fix,Query
------------

 - [4330: Fix regression in QueryBuilder::and|orWhere()](doctrine#4330) thanks to @BenMorel

Test Suite
----------

 - [4321: Update PHPUnit to 9.4](doctrine#4321) thanks to @morozov

Columns,SQL Server,Schema Managers
----------------------------------

 - [4315: Fix handling existing SQL Server column comment when other properties change](doctrine#4315) thanks to @trusek

CI
--

 - [4310: Migrate jobs away from Travis to Github Actions ](doctrine#4310) thanks to @greg0ire

BC Fix,Connections
------------------

 - [4308: doctrine#4295 Keep master, slaves, keepReplica params in MasterSlaveConnection](doctrine#4308) thanks to @kralos

New Feature,Prepared Statements
-------------------------------

 - [4289: Add a fetch mode methods for "PDO::FETCH&doctrine#95;KEY&doctrine#95;PAIR"](doctrine#4289) thanks to @tswcode

Bug,SQL Server,Schema
---------------------

 - [3400: Wrong column comment setting command in migrations of SQL Server](doctrine#3400) thanks to @msyfurukawa

# gpg: Signature made Mon Oct 19 04:18:17 2020
# gpg:                using DSA key 1BEDEE0A820BC30D858F9F0C2C3A645671828132
# gpg: Can't check signature: No public key
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants