Merge branch 'main' into feature/bots

modules/context/csrf.go

@@ -13,6 +13,7 @@
 // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 // License for the specific language governing permissions and limitations
 // under the License.
+// SPDX-License-Identifier: Apache-2.0
 
 // a middleware that generates and validates CSRF tokens.
 

modules/context/xsrf.go

@@ -13,6 +13,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
 
 package context
 

modules/context/xsrf_test.go

@@ -13,6 +13,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
 
 package context
 

modules/json/json.go

@@ -1,5 +1,5 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
+// SPDX-License-Identifier: MIT
 
 package json
 

modules/paginator/paginator.go

@@ -1,5 +1,6 @@
 // Copyright 2022 The Gitea Authors.
 // Copyright 2015 https://github.com/unknwon. Licensed under the Apache License, Version 2.0
+// SPDX-License-Identifier: Apache-2.0
 
 package paginator
 

modules/paginator/paginator_test.go

@@ -1,5 +1,6 @@
 // Copyright 2022 The Gitea Authors.
 // Copyright 2015 https://github.com/unknwon. Licensed under the Apache License, Version 2.0
+// SPDX-License-Identifier: Apache-2.0
 
 package paginator
 

modules/session/redis.go

@@ -13,6 +13,7 @@
 // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 // License for the specific language governing permissions and limitations
 // under the License.
+// SPDX-License-Identifier: Apache-2.0
 
 package session