Merge branch 'master' into develop

* master:
  Remove unavailable services from view
  Service stopped temporarily. No ETA to get back online
  webid-, patch-tracker-, duck-
This commit is contained in:
Jan Dittberner 2021-07-03 10:42:32 +02:00
commit 63f1cf3da2
2 changed files with 7 additions and 16 deletions

View file

@ -49,8 +49,8 @@ dmd.pattern=https://udd.debian.org/dmd.cgi?email1=%(email)s
lintian.pattern=https://lintian.debian.org/maintainer/%(email)s.html
lintianfull.pattern=https://lintian.debian.org/full/%(email)s.html
piuparts.pattern=https://piuparts.debian.org/sid/maintainer/%(firstchar)s/%(email)s.html
patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s
duck.pattern=http://duck.debian.net/persons/%(email)s.html
#patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s
#duck.pattern=http://duck.debian.net/persons/%(email)s.html
janitor.pattern=https://janitor.debian.net/m/%(email)s
[lists]
@ -76,8 +76,8 @@ dbfinger.type=finger
dbfinger.optional=true
db.pattern=https://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search
db.optional=true
webid.pattern=http://webid.debian.net/maintainers/%(username)s
webid.optional=true
#webid.pattern=http://webid.debian.net/maintainers/%(username)s
#webid.optional=true
salsa.pattern=https://salsa.debian.org/%(salsausername)s
salsa.optional=true
wiki.pattern=https://wiki.debian.org/%(wikihomepage)s
@ -119,6 +119,6 @@ groupinfo.pattern=ssh master.debian.org id %(username)s
groupinfo.type=ssh
groupinfo.optional=true
[ubuntu]
urls=ubuntudiff
ubuntudiff.pattern=http://ubuntudiff.debian.net/q/uploaders/%(email)s
#[ubuntu]
#urls=ubuntudiff
#ubuntudiff.pattern=http://ubuntudiff.debian.net/q/uploaders/%(email)s

View file

@ -50,8 +50,6 @@ _LABELS = {
bug=430986">#430986</a>)'''),
'reported': N_('bugs reported'),
'usertags': N_('user tags'),
'searchall': N_('all messages (i.e., full text search for \
developer name on all bug logs)'),
'wnpp': N_('<a href="https://wiki.debian.org/WNPP">WNPP</a>'),
'correspondent': N_('correspondent for bugs'),
'graph': N_('one year open bug history graph'),
@ -68,8 +66,6 @@ developer name on all bug logs)'),
'lintianfull': N_('full lintian reports (i.e. including \
"info"-level messages)'),
'piuparts': N_('piuparts'),
'patchtracker': N_('Debian patch tracking system'),
'duck': N_('Debian Url ChecKer'),
'janitor': N_('Debian Janitor'),
},
'lists': {
@ -87,7 +83,6 @@ developer name on all bug logs)'),
'nm': N_('NM'),
'dbfinger': N_('DB information via finger'),
'db': N_('DB information via HTTP'),
'webid': N_('FOAF profile'),
'salsa': N_('Salsa'),
'wiki': N_('Wiki'),
'forum': N_('Forum'),
@ -113,10 +108,6 @@ developer name on all bug logs)'),
'MIATeam">MIA</a> database information'),
'groupinfo': N_('Group membership information'),
},
'ubuntu': {
'label': N_('Ubuntu'),
'ubuntudiff': N_('Available patches from Ubuntu'),
},
}
#: list of field name tuples for Debian Maintainers