Merge branch 'master' into refactor-doctor

Author: techknowlogick

.drone.yml

@@ -18,7 +18,6 @@ steps:
       - make node_modules
 
   - name: lint-frontend
-    pull: always
     image: node:14
     commands:
       - make lint-frontend
@@ -35,7 +34,6 @@ steps:
       TAGS: bindata sqlite sqlite_unlock_notify
 
   - name: checks-frontend
-    pull: always
     image: node:14
     commands:
       - make checks-frontend
@@ -49,7 +47,6 @@ steps:
     depends_on: [lint-backend]
 
   - name: build-frontend
-    pull: always
     image: node:14
     commands:
       - make frontend
@@ -66,7 +63,6 @@ steps:
     depends_on: [checks-backend]
 
   - name: build-backend-arm64
-    pull: always
     image: golang:1.15
     environment:
       GO111MODULE: on
@@ -80,7 +76,6 @@ steps:
     depends_on: [checks-backend]
 
   - name: build-backend-386
-    pull: always
     image: golang:1.15
     environment:
       GO111MODULE: on
@@ -108,33 +103,28 @@ workspace:
 
 services:
   - name: mysql
-    pull: default
     image: mysql:5.7
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: yes
       MYSQL_DATABASE: test
 
   - name: mysql8
-    pull: default
     image: mysql:8.0
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: yes
       MYSQL_DATABASE: testgitea
 
   - name: mssql
-    pull: default
     image: mcr.microsoft.com/mssql/server:latest
     environment:
       ACCEPT_EULA: Y
       MSSQL_PID: Standard
       SA_PASSWORD: MwantsaSecurePassword1
 
   - name: ldap
-    pull: default
     image: gitea/test-openldap:latest
 
   - name: elasticsearch
-    pull: default
     environment:
       discovery.type: single-node
     image: elasticsearch:7.5.0
@@ -149,7 +139,6 @@ services:
 
 steps:
   - name: fetch-tags
-    pull: default
     image: docker:git
     commands:
       - git fetch --tags --force
@@ -175,7 +164,6 @@ steps:
       - git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA}
 
   - name: unit-test
-    pull: always
     image: golang:1.15
     commands:
       - make unit-test-coverage test-check
@@ -186,7 +174,6 @@ steps:
         from_secret: github_read_token
 
   - name: test-mysql
-    pull: always
     image: golang:1.15
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
@@ -202,7 +189,6 @@ steps:
       - build
 
   - name: test-mysql8
-    pull: always
     image: golang:1.15
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
@@ -217,7 +203,6 @@ steps:
       - build
 
   - name: test-mssql
-    pull: always
     image: golang:1.15
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
@@ -232,7 +217,6 @@ steps:
       - build
 
   - name: generate-coverage
-    pull: always
     image: golang:1.15
     commands:
       - make coverage
@@ -295,7 +279,6 @@ services:
 
 steps:
   - name: fetch-tags
-    pull: default
     image: docker:git
     commands:
       - git fetch --tags --force
@@ -315,7 +298,6 @@ steps:
       TAGS: bindata sqlite sqlite_unlock_notify
 
   - name: test-sqlite
-    pull: always
     image: golang:1.15
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
@@ -329,7 +311,6 @@ steps:
       - build
 
   - name: test-pgsql
-    pull: always
     image: golang:1.15
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
@@ -431,7 +412,6 @@ depends_on:
 
 steps:
   - name: fetch-tags
-    pull: default
     image: docker:git
     commands:
       - git fetch --tags --force
@@ -485,7 +465,6 @@ steps:
         - push
 
   - name: release-master
-    pull: always
     image: plugins/s3:1
     settings:
       acl: public-read
@@ -644,7 +623,6 @@ trigger:
 
 steps:
   - name: fetch-tags
-    pull: default
     image: docker:git
     commands:
       - git fetch --tags --force
@@ -668,7 +646,6 @@ steps:
         - pull_request
 
   - name: publish-rootless
-    pull: always
     image: plugins/docker:linux-amd64
     settings:
       dockerfile: Dockerfile.rootless
@@ -747,7 +724,6 @@ trigger:
   - "refs/tags/**"
 steps:
   - name: fetch-tags
-    pull: default
     image: docker:git
     commands:
       - git fetch --tags --force
@@ -774,7 +750,6 @@ steps:
         - pull_request
 
   - name: publish-rootless
-    pull: always
     image: plugins/docker:linux-arm64
     settings:
       dockerfile: Dockerfile.rootless
@@ -817,7 +792,6 @@ steps:
         from_secret: docker_username
 
   - name: manifest
-    pull: always
     image: plugins/manifest
     settings:
       auto_tag: true

.eslintrc

@@ -3,15 +3,19 @@ reportUnusedDisableDirectives: true
 
 ignorePatterns:
   - /web_src/js/vendor
+  - /templates/base/head.tmpl
+  - /templates/repo/activity.tmpl
+  - /templates/repo/view_file.tmpl
 
 parserOptions:
   sourceType: module
-  ecmaVersion: 2020
+  ecmaVersion: 2021
 
 plugins:
   - eslint-plugin-unicorn
   - eslint-plugin-import
   - eslint-plugin-vue
+  - eslint-plugin-html
 
 extends:
   - plugin:vue/recommended
@@ -27,12 +31,19 @@ globals:
   SimpleMDE: false
   u2fApi: false
 
+settings:
+  html/html-extensions: [".tmpl"]
+
 overrides:
-  - files: ["web_src/**/*.js", "web_src/**/*.vue"]
+  - files: ["web_src/**/*.js", "web_src/**/*.vue", "templates/**/*.tmpl"]
     env:
       browser: true
       jquery: true
       node: false
+  - files: ["templates/**/*.tmpl"]
+    rules:
+      no-tabs: [0]
+      indent: [2, tab, {SwitchCase: 1}]
   - files: ["web_src/**/*worker.js"]
     env:
       worker: true
@@ -224,6 +235,7 @@ rules:
   no-new-symbol: [2]
   no-new-wrappers: [2]
   no-new: [0]
+  no-nonoctal-decimal-escape: [2]
   no-obj-calls: [2]
   no-octal-escape: [2]
   no-octal: [2]

.gitattributes

@@ -1,3 +1,6 @@
 * text=auto eol=lf
 /vendor/** -text -eol linguist-vendored
 /public/vendor/** -text -eol linguist-vendored
+/templates/**/*.tmpl linguist-language=Handlebars
+/.eslintrc linguist-language=YAML
+/.stylelintrc linguist-language=YAML

.github/lock.yml

@@ -0,0 +1,23 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 60
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). `false` is disabled
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored.
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. `false` is disabled
+lockLabel: false
+
+# Comment to post before locking.
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs and link to relevant comments in this thread.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true

.golangci.yml

@@ -70,7 +70,7 @@ issues:
     - path: modules/log/
       linters:
         - errcheck
-    - path: routers/routes/routes.go
+    - path: routers/routes/macaron.go
       linters:
         - dupl
     - path: routers/api/v1/repo/issue_subscription.go

.npmrc

@@ -1,2 +1,4 @@
+audit=false
+fund=false
 package-lock=true
 save-exact=true

.stylelintrc

@@ -11,5 +11,5 @@ rules:
   no-descending-specificity: null
   number-leading-zero: never
   rule-empty-line-before: null
-  selector-pseudo-element-colon-notation: null
+  selector-pseudo-element-colon-notation: double
   shorthand-property-no-redundant-values: true

Dockerfile.rootless

@@ -50,8 +50,7 @@ RUN mkdir -p /var/lib/gitea /etc/gitea
 RUN chown git:git /var/lib/gitea /etc/gitea
 
 COPY docker/rootless /
-COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /usr/local/bin/gitea
-RUN chown root:root /usr/local/bin/* && chmod 755 /usr/local/bin/*
+COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /usr/local/bin/gitea
 
 USER git:git
 ENV GITEA_WORK_DIR /var/lib/gitea