Merge branch 'master' into fix-go-gitea#6946-pass-in-pr-into-hooks

Author: zeripath

.drone.yml

@@ -24,7 +24,7 @@ pipeline:
       branch: [ master ]
 
   update-translations:
-    image: alpine:3.7
+    image: alpine:3.10
     commands:
       - mv ./options/locale/locale_en-US.ini ./options/
       - sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
@@ -52,7 +52,6 @@ pipeline:
     image: webhippie/nodejs:latest
     pull: true
     commands:
-      - npm install
       - make css
       - make js
     when:
@@ -164,7 +163,7 @@ pipeline:
       event: [ tag ]
 
   test-mysql8:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -295,7 +294,7 @@ pipeline:
       branch: [ master ]
 
   docker-dryrun:
-    image: plugins/docker:17.12
+    image: plugins/docker:18.09
     pull: true
     repo: gitea/gitea
     cache_from: gitea/gitea
@@ -304,7 +303,7 @@ pipeline:
       event: [ pull_request ]
 
   release-docker:
-    image: plugins/docker:17.12
+    image: plugins/docker:18.09
     pull: true
     secrets: [ docker_username, docker_password ]
     repo: gitea/gitea
@@ -315,7 +314,7 @@ pipeline:
       branch: [ release/* ]
 
   docker:
-    image: plugins/docker:17.12
+    image: plugins/docker:18.09
     secrets: [ docker_username, docker_password ]
     pull: true
     repo: gitea/gitea

.gitignore

@@ -67,7 +67,6 @@ coverage.all
 /node_modules
 /modules/indexer/issues/indexers
 routers/repo/authorized_keys
-/package-lock.json
 /yarn.lock
 
 # Snapcraft

.lesshintrc.json

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

.npmrc

@@ -0,0 +1,11 @@
+extends: stylelint-config-standard
+
+rules:
+  block-closing-brace-empty-line-before: null
+  color-hex-length: null
+  comment-empty-line-before: null
+  declaration-empty-line-before: null
+  indentation: 4
+  no-descending-specificity: null
+  rule-empty-line-before: null
+  selector-pseudo-element-colon-notation: null

.stylelintrc

@@ -4,6 +4,16 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.8.3](https://github.com/go-gitea/gitea/releases/tag/v1.8.3) - 2019-06-17
+* BUGFIXES
+  * Always set userID on LFS authentication (#7224) (Part of #6993)
+  * Fix LFS Locks over SSH (#6999) (#7223)
+  * Fix duplicated file on pull request conflicted files (#7211) (#7214)
+  * Detect noreply email address as user (#7133) (#7195)
+  * Don't get milestone from DB if ID is zero (#7169) (#7174)
+  * Allow archived repos to be (un)starred and (un)watched (#7163) (#7168)
+  * Fix GCArgs load from ini (#7156) (#7157)
+
 ## [1.8.2](https://github.com/go-gitea/gitea/releases/tag/v1.8.2) - 2019-05-29
 * BUGFIXES
   * Fix possbile mysql invalid connnection error (#7051) (#7071)

CHANGELOG.md

@@ -1,7 +1,7 @@
 
 ###################################
 #Build stage
-FROM golang:1.12-alpine3.9 AS build-env
+FROM golang:1.12-alpine3.10 AS build-env
 
 ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
@@ -18,7 +18,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
 RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
  && make clean generate build
 
-FROM alpine:3.9
+FROM alpine:3.10
 LABEL maintainer="[email protected]"
 
 EXPOSE 22 3000

Dockerfile

@@ -29,3 +29,4 @@ Andrew Thornton <[email protected]> (@zeripath)
 John Olheiser <[email protected]> (@jolheiser)
 Richard Mahn <[email protected]> (@richmahn)
 Mrsdizzie <[email protected]> (@mrsdizzie)
+silverwind <[email protected]> (@silverwind)

MAINTAINERS

@@ -366,30 +366,33 @@ release-compress:
 	fi
 	cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done;
 
-.PHONY: js
-js:
-	@if ([ ! -d "$(PWD)/node_modules" ]); then \
-		echo "node_modules directory is absent, please run 'npm install' first"; \
+npm-check:
+	@hash npm > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+		echo "Please install Node.js 8.x or greater with npm"; \
 		exit 1; \
 	fi;
 	@hash npx > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		echo "Please install npm version 5.2+"; \
+		echo "Please install Node.js 8.x or greater with npm"; \
 		exit 1; \
 	fi;
+
+.PHONY: npm
+npm: npm-check
+	npm install --no-save
+
+.PHONY: npm-update
+npm-update: npm-check
+	npx updates -cu
+	rm -rf node_modules package-lock.json
+	npm install --package-lock
+
+.PHONY: js
+js: npm
 	npx eslint public/js
 
 .PHONY: css
-css:
-	@if ([ ! -d "$(PWD)/node_modules" ]); then \
-		echo "node_modules directory is absent, please run 'npm install' first"; \
-		exit 1; \
-	fi;
-	@hash npx > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		echo "Please install npm version 5.2+"; \
-		exit 1; \
-	fi;
-
-	npx lesshint public/less/
+css: npm
+	npx stylelint public/less
 	npx lessc --clean-css="--s0 -b" public/less/index.less public/css/index.css
 	$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),npx lessc --clean-css="--s0 -b" public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
 	npx postcss --use autoprefixer --no-map --replace public/css/*

Makefile

@@ -131,6 +131,10 @@ var (
 		Subcommands: []cli.Command{
 			microcmdAuthAddOauth,
 			microcmdAuthUpdateOauth,
+			cmdAuthAddLdapBindDn,
+			cmdAuthUpdateLdapBindDn,
+			cmdAuthAddLdapSimpleAuth,
+			cmdAuthUpdateLdapSimpleAuth,
 			microcmdAuthList,
 			microcmdAuthDelete,
 		},
@@ -144,7 +148,7 @@ var (
 
 	idFlag = cli.Int64Flag{
 		Name:  "id",
-		Usage: "ID of OAuth authentication source",
+		Usage: "ID of authentication source",
 	}
 
 	microcmdAuthDelete = cli.Command{