Bugzilla/Roadmap/ChangedFiles

Bugzilla upstream commits

These are the files that changed in 5.2 after the branching commit from 5.0.4.

Sorted oldest first.

$/!\$ Some of these have been merged back to 5.0.4.1.

Commit	Files affected	Will require work?
commit	contrib/jb2bz.py	irrelevant
template_after_create	Bugzilla/Hook.pm, Bugzilla/Template.pm, extensions/DExample/Extension.pm	the latter may require merges elsewhere
commit	template/en/default/list/list.html.tmpl	irrelevant
perltidy reformat #1	.pm, .pl, *.cgi	unmergeable
commit	Bugzilla/Bug.pm	irrelevant
commit	template/en/default/pages/release-notes.html.tmpl	irrelevant
commit	Bugzilla/DB/Schema/Mysql.pm	irrelevant
commit	contrib/perl-fmt (new file)	irrelevant
perltidy reformat #2	.pm, .pl	unmergeable
commit	Bugzilla/DB/Schema.pm, Bugzilla/Install/DB.pm	creates need to update schema
commit	Bugzilla/Constants.pm, template/en/default/pages/release-notes.html.tmpl	irrelevant
commit	template/en/default/global/header.html.tmpl	merged back to 5.0.4.1
refactor all DB files	*.pm	126 files changed; believed irrelevant
commit	Bugzilla/Config.pm	irrelevant
perltidy reformat #3	.pm, .pl	unmergeable
commit	Bugzilla/WebService/Group.pm	irrelevant
commit	template/en/default/setup/strings.txt.pl	irrelevant
commit	Bugzilla/DB.pm, Bugzilla/DB/Schema.pm, t/013dbschema.t	irrelevant
commit	Bugzilla/DB/Schema.pm, Bugzilla/DB/Schema/Mysql.pm, Bugzilla/DB/Schema/Oracle.pm, Bugzilla/DB/Schema/Pg.pm, Bugzilla/DB/Schema/Sqlite.pm	irrelevant
commit	Bugzilla/DB.pm, Bugzilla/DB/QuoteIdentifier.pm (new)	irrelevant
commit	Bugzilla/DB.pm, Bugzilla/DB/Schema.pm, t/013dbschema.t	creates need to update schema
commit	Bugzilla.pm	irrelevant
commit	Bugzilla/DB/Sqlite.pm	irrelevant
commit	extensions/MoreBugUrl/Extension.pm, extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl	former merged, latter does not require merge
commit	README	irrelevant
commit	Bugzilla/Install/DB.pm	irrelevant
commit	docs/en/rst/installing/linux.rst	irrelevant
commit	Bugzilla/BugMail.pm	believed already merged back
commit	docs/en/rst/installing/linux.rst, docs/en/rst/installing/mysql.rst, docs/en/rst/installing/quick-start.rst	irrelevant
commit	.github/pull_request_template.md	irrelevant
commit	Bugzilla/DB.pm, Bugzilla/DB/Mysql.pm, Bugzilla/DB/QuoteIdentifier.pm, Bugzilla/DB/Schema.pm, Bugzilla/Util.pm, t/002goodperl.t	irrelevant
commit	template/en/default/pages/release-notes.html.tmpl	irrelevant
commit	docs/en/rst/installing/quick-start.rst	irrelevant
commit	docs/en/rst/installing/quick-start.rst	irrelevant
commit	SECURITY.md (new file)	irrelevant
commit	.github/FUNDING.yml	irrelevant
commit	docs/en/rst/conf.py, docs/en/rst/installing/linux.rst, docs/en/rst/installing/mysql.rst, docs/en/rst/installing/quick-start.rst	irrelevant
commit	.readthedocs.yaml, docs/en/rst/conf.py, docs/makedocs.pl	irrelevant
commit	images/favicon.ico	irrelevant
require perl 5.14	.pm, .pl	will require merges elsewhere
commit	.github/workflows/release.yml	irrelevant
commit	t/001compile.t	irrelevant
commit	Bugzilla/Install/Requirements.pm	missing merge back to 5.0.4.1, but merged here
commit	testserver.pl	irrelevant
commit	.gitignore, skins/contrib/Dusk/admin.css, skins/contrib/Dusk/bug.css	irrelevant
$dbh->quote_identifier('groups');	Bugzilla/Bug.pm, Bugzilla/DB.pm, Bugzilla/DB/Mysql.pm, Bugzilla/DB/Schema.pm, Bugzilla/DB/Schema/Mysql.pm, Bugzilla/DB/Schema/Sqlite.pm, Bugzilla/Group.pm, Bugzilla/Install/DB.pm, Bugzilla/Object.pm, Bugzilla/Product.pm, Bugzilla/Search.pm, Bugzilla/User.pm, editgroups.cgi, editproducts.cgi, editusers.cgi, sanitycheck.cgi, userprefs.cgi, whine.pl	files/patch-while.pl does not require merge; others irrelevant
commit	Bugzilla/Config/Common.pm, Bugzilla/FlagType.pm, Bugzilla/Install/Requirements.pm, Bugzilla/Migrate/Gnats.pm, Bugzilla/Util.pm, email_in.pl	Requirements.pm believed already merged
commit	Dockerfile (new), Dockerfile.mariadb (new), README, docker-compose.yml (new), docker/000-default.conf (new), docker/checksetup_answers.txt, docker/my.cnf (new), docker/mysql/bugzilla.cnf (new), docker/startup.sh (new)	irrelevant
commit	template/en/default/email/new-user-details.txt.tmpl	irrelevant
commit	template/en/default/email/header-common.txt.tmpl	irrelevant
commit	Bugzilla/Constants.pm, Bugzilla/DB.pm, Bugzilla/DB/MariaDB.pm, Bugzilla/DB/Schema/MariaDB.pm, Bugzilla/Install/Requirements.pm, Build.PL, docs/en/rst/installing/essential-post-install-config.rst, t/004template.t, template/en/default/config.js.tmpl, template/en/default/setup/strings.txt.pl	irrelevant
commit	checksetup.pl, template/en/default/global/code-error.html.tmpl	irrelevant
commit	.gitignore	irrelevant
commit	.readthedocs.yaml, docs/en/images/bugzilla-logo-white.svg, docs/en/rst/_static/bugzilla.css, docs/en/rst/conf.py, docs/requirements.txt	irrelevant
commit	docs/requirements.txt	irrelevant
commit	Bugzilla/DB.pm	irrelevant
commit	Bugzilla/DB.pm, template/en/default/setup/strings.txt.pl	irrelevant
commit	Dockerfile, Dockerfile.mariadb, docker/checksetup_answers.txt, docker/mysql/bugzilla.cnf	irrelevant
commit	checksetup.pl	irrelevant
commit	.github/pull_request_template.md	irrelevant
commit	docs/en/rst/installing/db_server.rst, docs/en/rst/installing/mariadb.rst, docs/en/rst/installing/mysql.rst	irrelevant
QuickSearch inputs need labels	template/en/default/global/common-links.html.tmpl, template/en/default/index.html.tmpl, template/en/default/pages/quicksearch.html.tmpl	first merged; second requires merge; third irrelevant
commit	Bugzilla/Constants.pm	irrelevant
commit	Bugzilla/DB.pm	irrelevant
commit	template/en/default/account/create.html.tmpl	irrelevant
commit	template/en/default/setup/strings.txt.pl	irrelevant
commit	docs/en/rst/installing/quick-start.rst	irrelevant
commit	Bugzilla/DB/MariaDB.pm	irrelevant
commit	docker/mysql/bugzilla.cnf, docs/en/rst/installing/mariadb.rst, docs/en/rst/installing/quick-start.rst, template/en/default/setup/strings.txt.pl	irrelevant
commit	Bugzilla/Update.pm, template/en/default/index.html.tmpl	already merged back
commit	.github/pull_request_template.md	irrelevant
commit	Bugzilla/Config/Common.pm, Bugzilla/Config/General.pm, Bugzilla/DB/MariaDB.pm, Bugzilla/DB/Mysql.pm, Bugzilla/DB/Schema/MariaDB.pm, template/en/default/admin/params/common.html.tmpl, template/en/default/admin/params/general.html.tmpl	irrelevant
commit	Bugzilla/Install/DB.pm	irrelevant
commit	template/en/default/pages/release-notes.html.tmpl	irrelevant
commit	Bugzilla/BugMail.pm, Bugzilla/MIME.pm, Bugzilla/Mailer.pm	already merged back
commit	chart.cgi, report.cgi	irrelevant
commit	Bugzilla/User.pm	irrelevant
Release 5.2	Bugzilla/Constants.pm	irrelevant
commit	docs/en/rst/installing/mariadb.rst	irrelevant
commit	Bugzilla/Constants.pm	irrelevant
commit	extensions/MoreBugUrl/lib/WineHQForums.pm (new)	irrelevant
commit	.readthedocs.yaml	irrelevant

(Up through Sep 23, 2024: release of 5.2)

Our github commits

This table only tracks our version of index.html.tmpl, because it is proving difficult to merge. All of our other commits were mergeable by inspection.

$/!\$ our version of index.html.tmpl was forked from the master in early 2014.

Commit	Files affected	Will require work?
commit	template/en/custom/index.html.tmpl and 19 others	initial commit of localized index.html.tmpl
commit	index.html.tmpl, others	does not require merge
commit	index.html.tmpl	does not require merge
commit	index.html.tmpl	does not require merge
commit	index.html.tmpl	added search plugin code from upstream TODO; others irrelevant
commit	index.html.tmpl	claimed merge from 4.4.6; irrelevant
commit	index.html.tmpl	does not require merge
commit	index.html.tmpl	remove javascript; change 'terms'; looks like a partial reversion; TODO
commit	index.html.tmpl	undo one regression from previous commit; does not require merge
commit	index.html.tmpl	linimon merge from upstream
commit	index.html.tmpl	linimon merge from production "IF user.login"

Compare and Contrast

patchfile	affects	comments
patch-PR207213	extensions/MoreBugUrl/Extension.pm, lib/Phabricator.pm, extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl	latter does not require merge; others irrelvant
patch-PR250699	js/field.js	already upstreamed as pull request
patch-PR619847	attachment.cgi	does not require style merge; possibly should be upstreamed
patch-whine.pl	whine.pl	does not require merge

CategoryProject

Bugzilla/Roadmap/ChangedFiles (last edited 2025-01-16T20:46:31+0000 by MarkLinimon)