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

Fix alignment on Welcome page content (uplift to 1.1.x) #4138

Merged
merged 1 commit into from
Dec 5, 2019

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Dec 5, 2019

Uplift of #3940
Fixes brave/brave-browser#6846

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds self-assigned this Dec 5, 2019
@brave-builds brave-builds added this to the 1.1.x - Release milestone Dec 5, 2019
@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv December 5, 2019 00:24
@kjozwiak
Copy link
Member

kjozwiak commented Dec 5, 2019

Restarting on Win x64 due to the following failure:

EDITED: Forgot to add the Skip labels so cancelled https://ci.brave.com/job/brave-core-build-pr/job/PR-4138/2/ and restarted after adding the needed Skip labels.

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Dec 5, 2019
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.1.x approved after deliberating with @brave/uplift-approvers. Also agreed the following would be approved via the weekly b-c triage meeting. Both CI/Jenkins and CI/Travis passed without any issues. Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 5decd3e into 1.1.x Dec 5, 2019
@kjozwiak kjozwiak deleted the pr3940_ca-6846_1.1.x branch December 5, 2019 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants