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.

Sign up for GitHub

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

Jump to bottom

Fixes split one time tip (uplift to 1.11.x) #5778

Merged
merged 2 commits into from
Jun 10, 2020
Merged

Fixes split one time tip (uplift to 1.11.x) #5778

merged 2 commits into from
Jun 10, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jun 9, 2020 •
edited by LaurenWags
Loading

Uplift of #5776
Uplift of #5782

Resolves brave/brave-browser#10153
Resolves brave/brave-browser#10176

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 requested a review from a team June 9, 2020 04:49
@brave-builds brave-builds self-assigned this Jun 9, 2020
@brave-builds brave-builds added this to the 1.11.x - Beta milestone Jun 9, 2020
@NejcZdovc NejcZdovc removed their request for review June 9, 2020 04:49
@NejcZdovc NejcZdovc force-pushed the pr5776_split-scenario_1.11.x branch from d92786f to 93cf6ec Compare June 9, 2020 07:38
@NejcZdovc NejcZdovc force-pushed the pr5776_split-scenario_1.11.x branch from 61351f3 to 60da95f Compare June 10, 2020 05:28
@LaurenWags
Copy link
Member

macOS agent removed - https://ci.brave.com/job/pr-brave-browser-pr5776_split-scenario_1.11.x/4/execution/node/361/log/

needs to be re-run on macOS only

@LaurenWags LaurenWags added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Jun 10, 2020
LaurenWags
LaurenWags approved these changes Jun 10, 2020
View reviewed changes
Copy link
Member

@LaurenWags LaurenWags 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.11.x approved after deliberating with @brave/uplift-approvers.

@LaurenWags LaurenWags merged commit 86cc97b into 1.11.x Jun 10, 2020
@LaurenWags LaurenWags deleted the pr5776_split-scenario_1.11.x branch June 10, 2020 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LaurenWags LaurenWags LaurenWags approved these changes

Assignees

@brave-builds brave-builds

Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS feature/rewards
Projects
None yet
Milestone
1.11.x - Release #1
Development

Successfully merging this pull request may close these issues.
4 participants
@brave-builds @LaurenWags @NejcZdovc @brave-browser-releases