Skip to content

[automated] Merge branch 'release/2.1' => 'release/2.2' #7542

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

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/2.1 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

Instructions for merging

This repo does not appear to allow merge commits from the GitHub UI, so you will need to update this PR with a merge commit before closing this PR.

git fetch
git checkout release/2.1
git pull --ff-only
git checkout release/2.2
git pull --ff-only
git merge --no-ff release/2.1
# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2

After PR checks are complete push the branch

git push

Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

@ajaybhargavb ajaybhargavb self-assigned this Feb 13, 2019
@Eilon Eilon requested a review from ajaybhargavb February 13, 2019 19:37
@Eilon Eilon added the area-mvc Includes: MVC, Actions and Controllers, Localization, CORS, most templates label Feb 13, 2019
@ajaybhargavb ajaybhargavb requested review from natemcmaster and pranavkm and removed request for ajaybhargavb February 13, 2019 22:54
Copy link
Contributor

@natemcmaster natemcmaster left a comment

Choose a reason for hiding this comment

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

Lots of changes. Looks like a few might be unintentional. Here is how I filtered out the rename noise:

  1. open chrome devtools
  2. Run this in the console
for(x of document.querySelectorAll('div.highlight.empty')) {
    x.parentElement.parentElement.remove()
}

@ajaybhargavb ajaybhargavb force-pushed the merge/release/2.1-to-release/2.2 branch from 9b131e3 to 3396dcd Compare February 14, 2019 00:21
@ajaybhargavb ajaybhargavb force-pushed the merge/release/2.1-to-release/2.2 branch from 3396dcd to a2f2742 Compare February 14, 2019 00:25
@ajaybhargavb
Copy link
Contributor

Updated

@ajaybhargavb ajaybhargavb merged commit a827740 into dotnet:release/2.2 Feb 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-mvc Includes: MVC, Actions and Controllers, Localization, CORS, most templates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants