Resurrect patches from unstable branch#44
Closed
CyberShadow wants to merge 19 commits intobugzilla:masterfrom
Closed
Resurrect patches from unstable branch#44CyberShadow wants to merge 19 commits intobugzilla:masterfrom
CyberShadow wants to merge 19 commits intobugzilla:masterfrom
Conversation
…l in the "disable my account" description
…ags only when present
Fix a hard dependency on the BMO extension. order_columns is set in Bugzilla::Extension::BMO, which might not be present / loaded.
The default_platform and default_op_sys Bugzilla::Product methods are installed by the BMO extension, so don't attempt to invoke them when it isn't present.
* instant-search.js: Don't fail if product map isn't loaded getProduct had a hard dependency on the 'products' object, which is provided by products.js from the GuidedBugEntry extension. Check if the products variable exists before attempting to use it. This can happen when loading products.js fails, which in turn can happen when the GuidedBugEntry extension isn't present. * Instant search: Don't load products.js without GuidedBugEntry Fixes a 404 if the GuidedBugEntry extension is not present. * instant-search.js: Use throbber.gif from core Fixes remaining dependency on GuidedBugEntry.
Member
Author
|
Basic functionality seems to be working. |
Member
Author
|
I'm seeing some test failures (some caused by patches in this PR, some not), will go through those first. |
dylanwh
approved these changes
Jun 28, 2020
dylanwh
requested changes
Jun 28, 2020
|
|
||
| [% PROCESS global/redirect.html.tmpl | ||
| url = "https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines" | ||
| url = "[% terms.BugWritingGuidelinesURL %]" |
Member
There was a problem hiding this comment.
Suggested change
| url = "[% terms.BugWritingGuidelinesURL %]" | |
| url = terms.BugWritingGuidelinesURL |
Member
Author
There was a problem hiding this comment.
Yes, I saw you fixed this previously in 01732ce :) I will apply that here.
dylanwh
requested changes
Jul 4, 2020
Member
dylanwh
left a comment
dylanwh
left a comment
There was a problem hiding this comment.
The guard on extensions is wrong. $recurse doesn't get reset when we early-return from the function. I've suggested changing this to a package-scoped localized variable, which should work better.
| @@ -124,6 +125,14 @@ sub template_inner { | |||
| } | |||
|
|
|||
Member
There was a problem hiding this comment.
Suggested change
| our $in_extensions = 0; |
| # (through this method or has_extension). | ||
| # The extension list is not fully populated at that point, | ||
| # so the results would not be meaningful. | ||
| state $recursive = 0; |
Member
There was a problem hiding this comment.
Suggested change
| state $recursive = 0; |
| # The extension list is not fully populated at that point, | ||
| # so the results would not be meaningful. | ||
| state $recursive = 0; | ||
| die "Recursive attempt to load/query extensions" if $recursive; |
Member
There was a problem hiding this comment.
Suggested change
| die "Recursive attempt to load/query extensions" if $recursive; | |
| die "Recursive attempt to load/query extensions" if $in_extensions > 0; |
| push @$extensions, $package; | ||
| } | ||
| } | ||
| $recursive = 0; |
Member
There was a problem hiding this comment.
Suggested change
| $recursive = 0; |
| # so the results would not be meaningful. | ||
| state $recursive = 0; | ||
| die "Recursive attempt to load/query extensions" if $recursive; | ||
| $recursive = 1; |
Member
There was a problem hiding this comment.
Suggested change
| $recursive = 1; | |
| local $in_extensions = $in_extensions + 1; |
Member
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I ran a git filter-branch on a part of the old unstable branch to make cherry-picking easier. I'm including mostly my own commits, but more commits from the unstable branch can thus be resurrected from here (let me know if you would like me to add any particular ones):
https://github.com/CyberShadow/bmo/commits/unstable-reformatted
The commits here have all been previously reviewed (see the pull request references added by GitHub in the commit messages) and theoretically don't need further review but practically need to be retested due to bitrot (or e.g. mistakes during merge conflict resolution).
Opening as draft until I can test this as part of a full test deployment.