Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion browser/installer/allowed-dupes.mn
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,3 @@ browser/chrome/browser/content/newtab/data/content/assets/glyph-webextension-16.

# Bug 1998760 - Fix duplicated felt localization
browser/chrome/browser/builtin-addons/felt/content/locales/felt.ftl

3 changes: 3 additions & 0 deletions docs/readme/readme-banner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion dom/base/nsIContentPolicy.idl
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ interface nsIContentPolicy : nsISupports
const short REJECT_POLICY = -5;

/**
* Returned from shouldLoad or shouldProcess if restart is forced
* Returned from shouldLoad or shouldProcess if restart is forced
*/
const short REJECT_RESTARTFORCED = -6;

Expand Down
6 changes: 5 additions & 1 deletion taskcluster/gecko_taskgraph/util/scriptworker.py
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,11 @@ def get_signing_type_per_platform(build_platform, is_shippable, config):
if "devedition" in build_platform:
return get_devedition_signing_type(config)
if "enterprise" in build_platform:
if is_shippable and "enterprise-main" in config.params["head_ref"] and int(config.params["level"]) == 3:
if (
is_shippable
and "enterprise-main" in config.params["head_ref"]
and int(config.params["level"]) == 3
):
return get_enterprise_main_signing_type(config)
else:
return get_enterprise_try_signing_type(config)
Expand Down
4 changes: 3 additions & 1 deletion taskcluster/gecko_taskgraph/util/signed_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@


def is_partner_kind(kind):
if kind and kind.startswith(("release-partner", "release-eme-free", "enterprise-repack")):
if kind and kind.startswith(
("release-partner", "release-eme-free", "enterprise-repack")
):
return True


Expand Down