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

Auto-generate NTP backgrounds LICENSE file #8032

Merged
merged 1 commit into from
Feb 18, 2020

Conversation

fmarier
Copy link
Member

@fmarier fmarier commented Feb 3, 2020

Fixes #7460 along with brave/brave-core#4481.

Submitter Checklist:

Test Plan:

npm run build Release

Look at the "Background images" entry in brave://credits. It should contain URLs and licenses for all 16 background images.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions.

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@fmarier fmarier requested a review from bridiver February 3, 2020 19:34
@fmarier fmarier self-assigned this Feb 3, 2020
@fmarier fmarier force-pushed the generate-backgrounds-license-file-7460 branch from 3597270 to b18443c Compare February 12, 2020 01:31
bridiver
bridiver previously approved these changes Feb 12, 2020
lib/licensing.js Outdated Show resolved Hide resolved
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.

Left notes - LMK what you think! 😄

bridiver
bridiver previously approved these changes Feb 14, 2020
@fmarier fmarier force-pushed the generate-backgrounds-license-file-7460 branch from cf023d9 to 4a11656 Compare February 17, 2020 21:36
@fmarier
Copy link
Member Author

fmarier commented Feb 18, 2020

The only test failure is this one:

14:31:41  2 tests failed:
14:31:41      AutoplayPermissionContextBrowserTest.AskAutoplay (../../brave/browser/autoplay/autoplay_permission_context_browsertest.cc:227)
14:31:41      AutoplayPermissionContextBrowserTest.BlockByDefault (../../brave/browser/autoplay/autoplay_permission_context_browsertest.cc:189)

which is a known problem.

@bsclifton @bridiver Can one of you re-review so that I can merge this PR?

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.

++

@fmarier fmarier merged commit 19a6e30 into master Feb 18, 2020
@fmarier fmarier deleted the generate-backgrounds-license-file-7460 branch February 18, 2020 02:27
@bsclifton bsclifton added this to the 1.6.x - Nightly milestone Feb 18, 2020
const authorLink = getValidatedComponentField(component, 'link')
const originalUrl = getValidatedComponentField(component, 'originalUrl')
const license = getValidatedComponentField(component, 'license')
if ((license != 'used with permission') &&
Copy link
Contributor

Choose a reason for hiding this comment

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

cc @fmarier better if this could be case insensitive. had to workaround in brave/brave-core#4864

@bbondy bbondy modified the milestones: 1.6.x - Beta, 1.7.x - Dev Mar 10, 2020
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.

Automatically generate brave-core/components/brave_new_tab_ui/data/LICENSE
5 participants