Merge branch 'forgejo-federated-star' of codeberg.org:meissa/forgejo into forgejo-federated-star

2024-04-12 14:33:57 +02:00 · 2024-04-12 14:33:57 +02:00 · b878e74f76
commit b878e74f76
parent 71141a5ff3 37420442de
30 changed files with 37 additions and 21 deletions
--- a/models/forgefed/activity.go
+++ b/models/forgefed/activity.go
@ -1,4 +1,4 @@
-// Copyright 2023 The Forgejo Authors. All rights reserved.
+// Copyright 2023, 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package forgefed
--- a/models/forgefed/actor.go
+++ b/models/forgefed/actor.go
@ -1,4 +1,4 @@
-// Copyright 2023 The forgejo Authors. All rights reserved.
+// Copyright 2023, 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package forgefed
--- a/models/forgefed/actor_test.go
+++ b/models/forgefed/actor_test.go
@ -1,4 +1,4 @@
-// Copyright 2023 The forgejo Authors. All rights reserved.
+// Copyright 2023, 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package forgefed
--- a/models/forgefed/federationhost_test.go
+++ b/models/forgefed/federationhost_test.go
@ -1,4 +1,4 @@
-// Copyright 2024 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package forgefed
--- a/models/repo/following_repo.go
+++ b/models/repo/following_repo.go
@ -1,4 +1,4 @@
-// Copyright 2024 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package repo
--- a/models/repo/repo.go
+++ b/models/repo/repo.go
@ -1,4 +1,5 @@
-// Copyright 2021, 2024 The Gitea & forgejo Authors. All rights reserved.
+// Copyright 2021 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package repo
--- a/models/repo/repo_repository.go
+++ b/models/repo/repo_repository.go
@ -1,4 +1,4 @@
-// Copyright 2024 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 // ToDo: Is this package the right place for federated repo? May need to diskuss this.
 package repo
--- a/models/repo/repo_test.go
+++ b/models/repo/repo_test.go
@ -1,4 +1,5 @@
 // Copyright 2017 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package repo_test
--- a/models/user/user.go
+++ b/models/user/user.go
@ -1,6 +1,6 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2019 The Gitea Authors. All rights reserved.
-// Copyright 2024 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package user
--- a/models/user/user_test.go
+++ b/models/user/user_test.go
@ -1,4 +1,5 @@
 // Copyright 2017 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package user_test
--- a/modules/activitypub/client.go
+++ b/modules/activitypub/client.go
@ -1,4 +1,5 @@
-// Copyright 2022, 2023 The Forgejo & Gitea Authors. All rights reserved.
+// Copyright 2022 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 // TODO: Think about whether this should be moved to services/activitypub (compare to exosy/services/activitypub/client.go)
--- a/modules/activitypub/client_test.go
+++ b/modules/activitypub/client_test.go
@ -1,5 +1,5 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
-// Copyright 2023 The forgejo Authors. All rights reserved.
+// Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package activitypub
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@ -1,3 +1,4 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
--- a/modules/validation/helpers.go
+++ b/modules/validation/helpers.go
@ -1,3 +1,4 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

--- a/modules/validation/validatable.go
+++ b/modules/validation/validatable.go
@ -1,4 +1,5 @@
-// Copyright 2023 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package validation
--- a/modules/validation/validatable_test.go
+++ b/modules/validation/validatable_test.go
@ -1,4 +1,4 @@
-// Copyright 2024 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package validation
--- a/routers/api/v1/activitypub/repository.go
+++ b/routers/api/v1/activitypub/repository.go
@ -1,4 +1,4 @@
-// Copyright 2023, 2024 The forgejo Authors. All rights reserved.
+// Copyright 2023, 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package activitypub
--- a/routers/api/v1/activitypub/repository_test.go
+++ b/routers/api/v1/activitypub/repository_test.go
@ -1,3 +1,6 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package activitypub

 import (
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@ -1,6 +1,6 @@
 // Copyright 2015 The Gogs Authors. All rights reserved.
 // Copyright 2016 The Gitea Authors. All rights reserved.
-// Copyright 2023 The forgejo Authors. All rights reserved.
+// Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 // Package v1 Gitea API
--- a/routers/api/v1/swagger/options.go
+++ b/routers/api/v1/swagger/options.go
@ -1,4 +1,5 @@
-// Copyright 2023 The Gitea & forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2017 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package swagger
--- a/routers/api/v1/user/star.go
+++ b/routers/api/v1/user/star.go
@ -1,6 +1,6 @@
 // Copyright 2016 The Gogs Authors. All rights reserved.
 // Copyright 2020 The Gitea Authors.
-// Copyright 2024 The forgejo Authors.
+// Copyright 2024 The Forgejo Authors.
 // SPDX-License-Identifier: MIT

 package user
--- a/routers/utils/utils.go
+++ b/routers/utils/utils.go
@ -1,4 +1,5 @@
-// Copyright 2017, 2023 The Gitea & forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2017, 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package utils
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@ -1,6 +1,6 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// Copyright 2024 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package repo
--- a/routers/web/repo/setting/setting.go
+++ b/routers/web/repo/setting/setting.go
@ -1,6 +1,6 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2018 The Gitea Authors. All rights reserved.
-// Copyright 2024 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package setting
--- a/services/context/repo.go
+++ b/services/context/repo.go
@ -1,3 +1,4 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2017 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
--- a/services/context/repository.go
+++ b/services/context/repository.go
@ -1,4 +1,4 @@
-// Copyright 2023 The forgejo Authors. All rights reserved.
+// Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package context
--- a/services/forms/repo_form.go
+++ b/services/forms/repo_form.go
@ -1,3 +1,4 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2017 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@ -1,3 +1,4 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

--- a/services/repository/star.go
+++ b/services/repository/star.go
@ -1,4 +1,4 @@
-// Copyright 2024 The forgejo Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT

 package repository
--- a/services/user/user.go
+++ b/services/user/user.go
@ -1,3 +1,4 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT