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 sync resend (uplift to 0.66.x) #2967

Merged
merged 1 commit into from
Jul 22, 2019
Merged

Conversation

brave-builds
Copy link
Collaborator

Uplift of #2959

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.

@AlexeyBarabash
Copy link
Contributor

CI failed by this, not related to PR:

11:40:35  browser/ui/webui/navigation_bar_data_provider.h:6:  #ifndef header guard has wrong style, please use: BRAVE_BROWSER_UI_WEBUI_NAVIGATION_BAR_DATA_PROVIDER_H_  [build/header_guard] [5]
11:40:35  browser/ui/webui/navigation_bar_data_provider.h:20:  #endif line should be "#endif  // BRAVE_BROWSER_UI_WEBUI_NAVIGATION_BAR_DATA_PROVIDER_H_"  [build/header_guard] [5]
11:40:35  browser/ui/webui/navigation_bar_data_provider.h:14:  public: should be indented +1 space inside class NavigationBarDataProvider  [whitespace/indent] [3]
...
11:40:35  chromium_src/ui/base/webui/web_ui_util.cc:0:  No copyright message found.  You should have a line: "Copyright [year] <Copyright Owner>"  [legal/copyright] [5]
11:40:35  chromium_src/ui/base/webui/web_ui_util.cc:11:  Do not include .cc files from other packages  [build/include] [4]
...
11:40:40  content/common/frame_messages.h:0:  No #ifndef header guard found, suggested CPP variable is: BRAVE_CONTENT_COMMON_FRAME_MESSAGES_H_  [build/header_guard] [5]

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.

Approved uplift into 0.66.x. @bbondy also approved 👍

Please make sure that all the correct labels are being used and that the appropriate issue is moved into the correct milestone.

@AlexeyBarabash AlexeyBarabash merged commit d4a2266 into 0.66.x Jul 22, 2019
@AlexeyBarabash AlexeyBarabash deleted the pr2959_exp_resend_0.66.x branch July 22, 2019 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants