Skip to content

Commit c72ce4a

Browse files
authored
Add 'issuer_url' param to pendinggitlabpublisher form (#18996)
1 parent f578120 commit c72ce4a

File tree

2 files changed

+48
-46
lines changed

2 files changed

+48
-46
lines changed

warehouse/locale/messages.pot

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,13 +1560,13 @@ msgstr ""
15601560
#: warehouse/templates/manage/account/publishing.html:158
15611561
#: warehouse/templates/manage/account/publishing.html:171
15621562
#: warehouse/templates/manage/account/publishing.html:184
1563-
#: warehouse/templates/manage/account/publishing.html:227
1564-
#: warehouse/templates/manage/account/publishing.html:240
1565-
#: warehouse/templates/manage/account/publishing.html:253
1566-
#: warehouse/templates/manage/account/publishing.html:294
1567-
#: warehouse/templates/manage/account/publishing.html:313
1568-
#: warehouse/templates/manage/account/publishing.html:330
1569-
#: warehouse/templates/manage/account/publishing.html:349
1563+
#: warehouse/templates/manage/account/publishing.html:229
1564+
#: warehouse/templates/manage/account/publishing.html:242
1565+
#: warehouse/templates/manage/account/publishing.html:255
1566+
#: warehouse/templates/manage/account/publishing.html:296
1567+
#: warehouse/templates/manage/account/publishing.html:315
1568+
#: warehouse/templates/manage/account/publishing.html:332
1569+
#: warehouse/templates/manage/account/publishing.html:351
15701570
#: warehouse/templates/manage/account/recovery_codes-burn.html:48
15711571
#: warehouse/templates/manage/account/token.html:127
15721572
#: warehouse/templates/manage/account/token.html:152
@@ -3084,7 +3084,7 @@ msgid "%(username)s has not uploaded any projects to PyPI, yet."
30843084
msgstr ""
30853085

30863086
#: warehouse/templates/includes/accounts/profile-public-email.html:16
3087-
#: warehouse/templates/manage/account/publishing.html:238
3087+
#: warehouse/templates/manage/account/publishing.html:240
30883088
#: warehouse/templates/manage/project/publishing.html:236
30893089
msgid "Email"
30903090
msgstr ""
@@ -4712,22 +4712,22 @@ msgstr ""
47124712

47134713
#: warehouse/templates/manage/account/publishing.html:22
47144714
#: warehouse/templates/manage/account/publishing.html:130
4715-
#: warehouse/templates/manage/account/publishing.html:225
4716-
#: warehouse/templates/manage/account/publishing.html:292
4715+
#: warehouse/templates/manage/account/publishing.html:227
4716+
#: warehouse/templates/manage/account/publishing.html:294
47174717
msgid "PyPI Project Name"
47184718
msgstr ""
47194719

47204720
#: warehouse/templates/manage/account/publishing.html:27
47214721
#: warehouse/templates/manage/account/publishing.html:135
4722-
#: warehouse/templates/manage/account/publishing.html:230
4723-
#: warehouse/templates/manage/account/publishing.html:297
4722+
#: warehouse/templates/manage/account/publishing.html:232
4723+
#: warehouse/templates/manage/account/publishing.html:299
47244724
msgid "project name"
47254725
msgstr ""
47264726

47274727
#: warehouse/templates/manage/account/publishing.html:29
47284728
#: warehouse/templates/manage/account/publishing.html:137
4729-
#: warehouse/templates/manage/account/publishing.html:232
4730-
#: warehouse/templates/manage/account/publishing.html:305
4729+
#: warehouse/templates/manage/account/publishing.html:234
4730+
#: warehouse/templates/manage/account/publishing.html:307
47314731
msgid "The project (on PyPI) that will be created when this publisher is used"
47324732
msgstr ""
47334733

@@ -4783,7 +4783,7 @@ msgstr ""
47834783

47844784
#: warehouse/templates/manage/account/publishing.html:88
47854785
#: warehouse/templates/manage/account/publishing.html:186
4786-
#: warehouse/templates/manage/account/publishing.html:255
4786+
#: warehouse/templates/manage/account/publishing.html:257
47874787
#: warehouse/templates/manage/project/publishing.html:94
47884788
#: warehouse/templates/manage/project/publishing.html:181
47894789
#: warehouse/templates/manage/project/publishing.html:253
@@ -4803,9 +4803,9 @@ msgid ""
48034803
msgstr ""
48044804

48054805
#: warehouse/templates/manage/account/publishing.html:110
4806-
#: warehouse/templates/manage/account/publishing.html:205
4807-
#: warehouse/templates/manage/account/publishing.html:272
4808-
#: warehouse/templates/manage/account/publishing.html:364
4806+
#: warehouse/templates/manage/account/publishing.html:207
4807+
#: warehouse/templates/manage/account/publishing.html:274
4808+
#: warehouse/templates/manage/account/publishing.html:366
48094809
#: warehouse/templates/manage/project/publishing.html:117
48104810
#: warehouse/templates/manage/project/publishing.html:215
48114811
#: warehouse/templates/manage/project/publishing.html:270
@@ -4895,141 +4895,141 @@ msgid ""
48954895
"access who shouldn't have PyPI publishing access."
48964896
msgstr ""
48974897

4898-
#: warehouse/templates/manage/account/publishing.html:212
4898+
#: warehouse/templates/manage/account/publishing.html:214
48994899
#: warehouse/templates/manage/project/publishing.html:223
49004900
#, python-format
49014901
msgid ""
49024902
"Read more about Google's OpenID Connect support <a "
49034903
"href=\"%(href)s\">here</a>."
49044904
msgstr ""
49054905

4906-
#: warehouse/templates/manage/account/publishing.html:243
4906+
#: warehouse/templates/manage/account/publishing.html:245
49074907
#: warehouse/templates/manage/project/publishing.html:241
49084908
msgid "email"
49094909
msgstr ""
49104910

4911-
#: warehouse/templates/manage/account/publishing.html:245
4911+
#: warehouse/templates/manage/account/publishing.html:247
49124912
#: warehouse/templates/manage/project/publishing.html:243
49134913
msgid "The email address of the account or service account used to publish."
49144914
msgstr ""
49154915

4916-
#: warehouse/templates/manage/account/publishing.html:251
4916+
#: warehouse/templates/manage/account/publishing.html:253
49174917
#: warehouse/templates/manage/project/publishing.html:249
49184918
msgid "Subject"
49194919
msgstr ""
49204920

4921-
#: warehouse/templates/manage/account/publishing.html:258
4921+
#: warehouse/templates/manage/account/publishing.html:260
49224922
#: warehouse/templates/manage/project/publishing.html:256
49234923
msgid "subject"
49244924
msgstr ""
49254925

4926-
#: warehouse/templates/manage/account/publishing.html:266
4926+
#: warehouse/templates/manage/account/publishing.html:268
49274927
#, python-format
49284928
msgid ""
49294929
"The subject is the numeric ID that represents the principal making the "
49304930
"request. While not required, providing the subject further restricts the "
49314931
"identity used for publishing. <a href=\"%(href)s\">More details here.</a>"
49324932
msgstr ""
49334933

4934-
#: warehouse/templates/manage/account/publishing.html:279
4934+
#: warehouse/templates/manage/account/publishing.html:281
49354935
#: warehouse/templates/manage/project/publishing.html:278
49364936
#, python-format
49374937
msgid ""
49384938
"Read more about ActiveState's OpenID Connect support <a "
49394939
"href=\"%(href)s\">here</a>."
49404940
msgstr ""
49414941

4942-
#: warehouse/templates/manage/account/publishing.html:311
4942+
#: warehouse/templates/manage/account/publishing.html:313
49434943
#: warehouse/templates/manage/project/publishing.html:291
49444944
#: warehouse/templates/organizations/profile.html:17
49454945
msgid "Organization"
49464946
msgstr ""
49474947

4948-
#: warehouse/templates/manage/account/publishing.html:316
4948+
#: warehouse/templates/manage/account/publishing.html:318
49494949
#: warehouse/templates/manage/project/publishing.html:296
49504950
msgid "my-organization"
49514951
msgstr ""
49524952

4953-
#: warehouse/templates/manage/account/publishing.html:323
4953+
#: warehouse/templates/manage/account/publishing.html:325
49544954
#: warehouse/templates/manage/project/publishing.html:303
49554955
msgid "The ActiveState organization name that owns the project"
49564956
msgstr ""
49574957

4958-
#: warehouse/templates/manage/account/publishing.html:328
4958+
#: warehouse/templates/manage/account/publishing.html:330
49594959
#: warehouse/templates/manage/project/publishing.html:308
49604960
msgid "ActiveState Project name"
49614961
msgstr ""
49624962

4963-
#: warehouse/templates/manage/account/publishing.html:333
4963+
#: warehouse/templates/manage/account/publishing.html:335
49644964
#: warehouse/templates/manage/project/publishing.html:313
49654965
msgid "my-project"
49664966
msgstr ""
49674967

4968-
#: warehouse/templates/manage/account/publishing.html:341
4968+
#: warehouse/templates/manage/account/publishing.html:343
49694969
#: warehouse/templates/manage/project/publishing.html:321
49704970
msgid "The ActiveState project that will build your Python artifact."
49714971
msgstr ""
49724972

4973-
#: warehouse/templates/manage/account/publishing.html:347
4973+
#: warehouse/templates/manage/account/publishing.html:349
49744974
#: warehouse/templates/manage/project/publishing.html:327
49754975
msgid "Actor Username"
49764976
msgstr ""
49774977

4978-
#: warehouse/templates/manage/account/publishing.html:352
4978+
#: warehouse/templates/manage/account/publishing.html:354
49794979
#: warehouse/templates/manage/project/publishing.html:332
49804980
msgid "my-username"
49814981
msgstr ""
49824982

4983-
#: warehouse/templates/manage/account/publishing.html:358
4983+
#: warehouse/templates/manage/account/publishing.html:360
49844984
#: warehouse/templates/manage/project/publishing.html:338
49854985
msgid ""
49864986
"The username for the ActiveState account that will trigger the build of "
49874987
"your Python artifact."
49884988
msgstr ""
49894989

4990-
#: warehouse/templates/manage/account/publishing.html:373
4990+
#: warehouse/templates/manage/account/publishing.html:375
49914991
msgid "Manage publishers"
49924992
msgstr ""
49934993

4994-
#: warehouse/templates/manage/account/publishing.html:380
4994+
#: warehouse/templates/manage/account/publishing.html:382
49954995
msgid "Project"
49964996
msgstr ""
49974997

4998-
#: warehouse/templates/manage/account/publishing.html:400
4998+
#: warehouse/templates/manage/account/publishing.html:402
49994999
msgid ""
50005000
"No publishers are currently configured. Publishers for existing projects "
50015001
"can be added in the publishing configuration for each individual project."
50025002
msgstr ""
50035003

5004-
#: warehouse/templates/manage/account/publishing.html:410
5004+
#: warehouse/templates/manage/account/publishing.html:412
50055005
msgid "Pending project name"
50065006
msgstr ""
50075007

5008-
#: warehouse/templates/manage/account/publishing.html:411
5008+
#: warehouse/templates/manage/account/publishing.html:413
50095009
#: warehouse/templates/manage/project/publishing.html:368
50105010
msgid "Publisher"
50115011
msgstr ""
50125012

5013-
#: warehouse/templates/manage/account/publishing.html:412
5013+
#: warehouse/templates/manage/account/publishing.html:414
50145014
#: warehouse/templates/manage/project/publishing.html:369
50155015
msgid "Details"
50165016
msgstr ""
50175017

5018-
#: warehouse/templates/manage/account/publishing.html:422
5018+
#: warehouse/templates/manage/account/publishing.html:424
50195019
msgid ""
50205020
"No pending publishers are currently configured. Publishers for projects "
50215021
"that don't exist yet can be added below."
50225022
msgstr ""
50235023

5024-
#: warehouse/templates/manage/account/publishing.html:429
5024+
#: warehouse/templates/manage/account/publishing.html:431
50255025
msgid "Add a new pending publisher"
50265026
msgstr ""
50275027

5028-
#: warehouse/templates/manage/account/publishing.html:431
5028+
#: warehouse/templates/manage/account/publishing.html:433
50295029
msgid "You can use this page to register \"pending\" trusted publishers."
50305030
msgstr ""
50315031

5032-
#: warehouse/templates/manage/account/publishing.html:436
5032+
#: warehouse/templates/manage/account/publishing.html:438
50335033
#, python-format
50345034
msgid ""
50355035
"These publishers behave similarly to trusted publishers registered "
@@ -5040,14 +5040,14 @@ msgid ""
50405040
"trusted publishers <a href=\"%(href)s\">here</a>."
50415041
msgstr ""
50425042

5043-
#: warehouse/templates/manage/account/publishing.html:446
5043+
#: warehouse/templates/manage/account/publishing.html:448
50445044
msgid ""
50455045
"Configuring a \"pending\" publisher for a project name does "
50465046
"<strong>not</strong> reserve that name. Until the project is created, any"
50475047
" other user may create it, including via their own \"pending\" publisher."
50485048
msgstr ""
50495049

5050-
#: warehouse/templates/manage/account/publishing.html:481
5050+
#: warehouse/templates/manage/account/publishing.html:483
50515051
#: warehouse/templates/manage/project/publishing.html:412
50525052
#, python-format
50535053
msgid ""

warehouse/templates/manage/account/publishing.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@
199199
{% endtrans %}
200200
</p>
201201
<div id="environment-errors">{{ field_errors(pending_gitlab_publisher_form.environment) }}</div>
202+
{# The following field must be present for the view predicate to match #}
203+
{{ pending_gitlab_publisher_form.issuer_url(hidden=True) }}
202204
</div>
203205
<div>
204206
<input type="submit"

0 commit comments

Comments
 (0)