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

Merge release 2.1.2 into master #867

Merged
merged 5 commits into from
Nov 13, 2019

Conversation

doctrinebot
Copy link

Release 2.1.2

2.1.2

  • Total issues resolved: 0
  • Total pull requests resolved: 1
  • Total contributors: 1

Documentation

stof and others added 2 commits September 30, 2019 11:35
We should not recommend an exact match on 2.0
Fix the installation instruction
@Ocramius Ocramius added this to the 2.2.0 milestone Nov 10, 2019
@alcaeus
Copy link
Member

alcaeus commented Nov 11, 2019

Appveyor failure is unrelated to this PR, would override.

@Ocramius not sure how to proceed with the requirement of having the PR up-to-date with the base branch: that kinda defeats the purpose of doing these merge-ups. Shall we disable that protected branch rule in our repos?

@Ocramius
Copy link
Member

I don't think these merge-up branches will ever be mergeable via UI anyway

@alcaeus
Copy link
Member

alcaeus commented Nov 11, 2019

I don't think these merge-up branches will ever be mergeable via UI anyway

With branch protection enabled, they can only be merged via UI since we can't push directly to other branches. Hence the idea to disable the up-to-date rule.

I agree that they will almost never be mergeable without manual work, but that's also the reason why we decided to create PRs from intermediate branches instead of merging directly in the tool.

czarpino and others added 3 commits November 13, 2019 02:47
Single backslash in double quotes causes malformed YAML error
Escape backslash in YAML example
* 2.1.x:
  Escape backslash in YAML example
  Fix the installation instruction
@alcaeus alcaeus merged commit 0c2813b into master Nov 13, 2019
@alcaeus alcaeus deleted the 2.1-merge-up-into-master_5dc886ccbf0671.45022575 branch November 13, 2019 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants