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

Fixes text for wallet verification (uplift to 0.70.x) #3349

Merged
merged 1 commit into from
Sep 4, 2019

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Sep 4, 2019

Uplift of #3333
Fixes brave/brave-browser#5875

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 Sep 4, 2019
@brave-builds brave-builds added this to the 0.70.x - Dev milestone Sep 4, 2019
@kjozwiak
Copy link
Member

kjozwiak commented Sep 4, 2019

Restarting as this is due to the AWS spot fleet plugin as per:

Agent was removed

via

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++

@bsclifton bsclifton merged commit 4cc0c2a into 0.70.x Sep 4, 2019
@bsclifton bsclifton deleted the pr3333_verified-text_0.70.x branch September 4, 2019 22:55
@bsclifton bsclifton added the CI/skip Do not run CI builds (except noplatform) label Sep 4, 2019
hashmi-waseem pushed a commit to hashmi-waseem/brave-core that referenced this pull request May 6, 2024
… to 0.61.x) (brave#1742)

* Test network request in Tor profile with broken tor config.

Should fail, but currently this is broken (brave#3058, brave#3349).

* Block all external URL requests if tor is not set up right.

Allow chrome, chrome-extension, and chrome-devtools URLs.

This way we don't have to rely on other logic to prevent usage of the
Tor profile before the daemon is configured, which turned out not be
as reliable as hoped.

fix brave#3058
fix brave#3349

* Appease lint and avoid C++ pitfalls.

- Fix copyright headings to appease lint.
- Fix header include guards to appease lint.
- Fix missing includes.
- Use explicit for unary constructors.
- Fix whitespace to appease lint.
hashmi-waseem pushed a commit to hashmi-waseem/brave-core that referenced this pull request May 6, 2024
… to 0.62.x) (brave#1741)

* Test network request in Tor profile with broken tor config.

Should fail, but currently this is broken (brave#3058, brave#3349).

* Block all external URL requests if tor is not set up right.

Allow chrome, chrome-extension, and chrome-devtools URLs.

This way we don't have to rely on other logic to prevent usage of the
Tor profile before the daemon is configured, which turned out not be
as reliable as hoped.

fix brave#3058
fix brave#3349

* Appease lint and avoid C++ pitfalls.

- Fix copyright headings to appease lint.
- Fix header include guards to appease lint.
- Fix missing includes.
- Use explicit for unary constructors.
- Fix whitespace to appease lint.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip Do not run CI builds (except noplatform)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants