From 283b19bad5ea822f69403f0e200f83e3fa498147 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 27 Sep 2023 01:00:12 +0800 Subject: [PATCH] Fix more yaml lint errors (#27284) (#27288) Backport #27284 by @lunny Fix #27268 Co-authored-by: Lunny Xiao --- .yamllint.yaml | 2 -- models/fixtures/access.yml | 1 - models/fixtures/access_token.yml | 8 ++++---- models/fixtures/commit_status_index.yml | 2 +- models/fixtures/public_key.yml | 2 +- models/fixtures/pull_request.yml | 2 +- models/fixtures/reaction.yml | 10 +++++----- models/fixtures/review.yml | 10 +++++----- models/fixtures/team_repo.yml | 2 +- models/fixtures/team_user.yml | 2 +- models/fixtures/watch.yml | 2 +- .../Test_DeleteOrphanedIssueLabels/issue_label.yml | 1 - .../fixtures/Test_DeleteOrphanedIssueLabels/label.yml | 2 +- .../fixtures/Test_RemoveInvalidLabels/label.yml | 1 - .../webauthn_credential.yml | 1 - 15 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.yamllint.yaml b/.yamllint.yaml index c0fce7c30..7f0517fb7 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -44,5 +44,3 @@ rules: ignore: | .venv node_modules - /models/fixtures - /models/migrations/fixtures diff --git a/models/fixtures/access.yml b/models/fixtures/access.yml index 446502843..1bb6a9a8a 100644 --- a/models/fixtures/access.yml +++ b/models/fixtures/access.yml @@ -135,4 +135,3 @@ user_id: 31 repo_id: 28 mode: 4 - diff --git a/models/fixtures/access_token.yml b/models/fixtures/access_token.yml index 791b3da1c..0744255f6 100644 --- a/models/fixtures/access_token.yml +++ b/models/fixtures/access_token.yml @@ -2,7 +2,7 @@ id: 1 uid: 1 name: Token A - #token: d2c6c1ba3890b309189a8e618c72a162e4efbf36 + # token: d2c6c1ba3890b309189a8e618c72a162e4efbf36 token_hash: 2b3668e11cb82d3af8c6e4524fc7841297668f5008d1626f0ad3417e9fa39af84c268248b78c481daa7e5dc437784003494f token_salt: QuSiZr1byZ token_last_eight: e4efbf36 @@ -13,7 +13,7 @@ id: 2 uid: 1 name: Token B - #token: 4c6f36e6cf498e2a448662f915d932c09c5a146c + # token: 4c6f36e6cf498e2a448662f915d932c09c5a146c token_hash: 1a0e32a231ebbd582dc626c1543a42d3c63d4fa76c07c72862721467c55e8f81c923d60700f0528b5f5f443f055559d3a279 token_salt: Lfwopukrq5 token_last_eight: 9c5a146c @@ -24,10 +24,10 @@ id: 3 uid: 2 name: Token A - #token: 90a18faa671dc43924b795806ffe4fd169d28c91 + # token: 90a18faa671dc43924b795806ffe4fd169d28c91 token_hash: d6d404048048812d9e911d93aefbe94fc768d4876fdf75e3bef0bdc67828e0af422846d3056f2f25ec35c51dc92075685ec5 token_salt: 99ArgXKlQQ token_last_eight: 69d28c91 created_unix: 946687980 updated_unix: 946687980 -#commented out tokens so you can see what they are in plaintext + # commented out tokens so you can see what they are in plaintext diff --git a/models/fixtures/commit_status_index.yml b/models/fixtures/commit_status_index.yml index 3f252e87e..f63343b04 100644 --- a/models/fixtures/commit_status_index.yml +++ b/models/fixtures/commit_status_index.yml @@ -2,4 +2,4 @@ id: 1 repo_id: 1 sha: "1234123412341234123412341234123412341234" - max_index: 5 \ No newline at end of file + max_index: 5 diff --git a/models/fixtures/public_key.yml b/models/fixtures/public_key.yml index 08f5c349a..ae620ee2d 100644 --- a/models/fixtures/public_key.yml +++ b/models/fixtures/public_key.yml @@ -8,4 +8,4 @@ type: 1 created_unix: 1559593109 updated_unix: 1565224552 - login_source_id: 0 \ No newline at end of file + login_source_id: 0 diff --git a/models/fixtures/pull_request.yml b/models/fixtures/pull_request.yml index 396bdba88..560674c37 100644 --- a/models/fixtures/pull_request.yml +++ b/models/fixtures/pull_request.yml @@ -97,4 +97,4 @@ issue_id: 20 index: 1 head_repo_id: 23 - base_repo_id: 23 \ No newline at end of file + base_repo_id: 23 diff --git a/models/fixtures/reaction.yml b/models/fixtures/reaction.yml index 4925935fe..ee571a73a 100644 --- a/models/fixtures/reaction.yml +++ b/models/fixtures/reaction.yml @@ -1,5 +1,5 @@ - - id: 1 #issue reaction + id: 1 # issue reaction type: zzz # not allowed reaction (added before allowed reaction list has changed) issue_id: 1 comment_id: 0 @@ -7,7 +7,7 @@ created_unix: 1573248001 - - id: 2 #issue reaction + id: 2 # issue reaction type: zzz # not allowed reaction (added before allowed reaction list has changed) issue_id: 1 comment_id: 0 @@ -15,7 +15,7 @@ created_unix: 1573248002 - - id: 3 #issue reaction + id: 3 # issue reaction type: eyes # allowed reaction issue_id: 1 comment_id: 0 @@ -23,7 +23,7 @@ created_unix: 1573248003 - - id: 4 #comment reaction + id: 4 # comment reaction type: laugh # allowed reaction issue_id: 1 comment_id: 2 @@ -31,7 +31,7 @@ created_unix: 1573248004 - - id: 5 #comment reaction + id: 5 # comment reaction type: laugh # allowed reaction issue_id: 1 comment_id: 2 diff --git a/models/fixtures/review.yml b/models/fixtures/review.yml index f964c6ac0..7a8808006 100644 --- a/models/fixtures/review.yml +++ b/models/fixtures/review.yml @@ -133,7 +133,7 @@ updated_unix: 946684831 created_unix: 946684831 -- +- id: 16 type: 4 reviewer_id: 20 @@ -142,7 +142,7 @@ updated_unix: 946684832 created_unix: 946684832 -- +- id: 17 type: 1 reviewer_id: 20 @@ -150,11 +150,12 @@ content: "review approved by user20" updated_unix: 946684833 created_unix: 946684833 -- + +- id: 18 type: 4 reviewer_id: 0 - reviewer_team_id: 5 + reviewer_team_id: 5 issue_id: 20 content: "review request for team5" updated_unix: 946684834 @@ -169,4 +170,3 @@ content: "review request for user15" updated_unix: 946684835 created_unix: 946684835 - diff --git a/models/fixtures/team_repo.yml b/models/fixtures/team_repo.yml index a523a90b2..849772089 100644 --- a/models/fixtures/team_repo.yml +++ b/models/fixtures/team_repo.yml @@ -62,4 +62,4 @@ id: 11 org_id: 17 team_id: 9 - repo_id: 24 \ No newline at end of file + repo_id: 24 diff --git a/models/fixtures/team_user.yml b/models/fixtures/team_user.yml index a5f1e9fd9..9142fe609 100644 --- a/models/fixtures/team_user.yml +++ b/models/fixtures/team_user.yml @@ -124,7 +124,7 @@ team_id: 20 uid: 5 -- +- id: 22 org_id: 17 team_id: 9 diff --git a/models/fixtures/watch.yml b/models/fixtures/watch.yml index c29f6bb65..1950ac99e 100644 --- a/models/fixtures/watch.yml +++ b/models/fixtures/watch.yml @@ -26,4 +26,4 @@ id: 5 user_id: 11 repo_id: 1 - mode: 3 # auto + mode: 3 # auto diff --git a/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/issue_label.yml b/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/issue_label.yml index 96104ac04..b02cb570e 100644 --- a/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/issue_label.yml +++ b/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/issue_label.yml @@ -26,4 +26,3 @@ id: 5 issue_id: 2 label_id: 87 - diff --git a/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml b/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml index d651c87d5..fa9658aa0 100644 --- a/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml +++ b/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml @@ -18,7 +18,7 @@ - id: 3 repo_id: 0 - org_id: 3 + org_id: 3 name: orglabel3 color: '#abcdef' num_issues: 0 diff --git a/models/migrations/fixtures/Test_RemoveInvalidLabels/label.yml b/models/migrations/fixtures/Test_RemoveInvalidLabels/label.yml index 094b811d9..0f5a3eb50 100644 --- a/models/migrations/fixtures/Test_RemoveInvalidLabels/label.yml +++ b/models/migrations/fixtures/Test_RemoveInvalidLabels/label.yml @@ -23,4 +23,3 @@ id: 5 repo_id: 3 org_id: 0 - diff --git a/models/migrations/fixtures/Test_StoreWebauthnCredentialIDAsBytes/webauthn_credential.yml b/models/migrations/fixtures/Test_StoreWebauthnCredentialIDAsBytes/webauthn_credential.yml index c02a76e37..ebb73f44d 100644 --- a/models/migrations/fixtures/Test_StoreWebauthnCredentialIDAsBytes/webauthn_credential.yml +++ b/models/migrations/fixtures/Test_StoreWebauthnCredentialIDAsBytes/webauthn_credential.yml @@ -28,4 +28,3 @@ attestation_type: 'fido-u2f' sign_count: 1 clone_warning: false -