include gitea changes in readme

.github/readme.md

@@ -7,28 +7,35 @@ Drone is a Continuous Delivery system built on container technology. Drone uses
 Sample Pipeline Configuration:
 
 ```yaml
-pipeline:
-  backend:
-    image: golang
-    commands:
-      - go get
-      - go build
-      - go test
+name: default
 
-  frontend:
-    image: node:6
-    commands:
-      - npm install
-      - npm test
+kind: pipeline
+type: docker
 
-  publish:
-    image: plugins/docker
+steps:
+- name: backend
+  image: golang
+  commands:
+    - go get
+    - go build
+    - go test
+
+- name: frontend
+  image: node:6
+  commands:
+    - npm install
+    - npm test
+
+- name: publish
+  image: plugins/docker
+  settings:
     repo: octocat/hello-world
     tags: [ 1, 1.1, latest ]
     registry: index.docker.io
 
-  notify:
-    image: plugins/slack
+- name: notify
+  image: plugins/slack
+  settings:
     channel: developers
     username: drone
 ```

CHANGELOG.md

@@ -9,9 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - support for configuration conversion plugins (e.g. convert from starlark)
 - moved native jsonnet to a conversion plugin
 
+### Removed
+- Support for basic auth as an option for Gitea, by [@techknowlogick](https://giteahub.com/techknowlogick). [#2721](https://github.com/drone/drone/issues/2721)
+
 ## [1.3.1] - 2019-08-26
 ### Added
-
 - support for the GitHub deployment status API, by [@bradrydzewski](https://github.com/bradrydzewski).
 
 ## [1.3.0] - 2019-08-20

cmd/drone-server/inject_client.go

@@ -117,16 +117,6 @@ func provideGiteaClient(config config.Config) *scm.Client {
 	if config.Gitea.Debug {
 		client.DumpResponse = httputil.DumpResponse
 	}
-	if config.Gitea.ClientID == "" {
-		client.Client = &http.Client{
-			Transport: &oauth2.Transport{
-				Scheme: oauth2.SchemeToken,
-				Source: oauth2.ContextTokenSource(),
-				Base:   defaultTransport(config.Gitea.SkipVerify),
-			},
-		}
-		return client
-	}
 	client.Client = &http.Client{
 		Transport: &oauth2.Transport{
 			Scheme: oauth2.SchemeBearer,

cmd/drone-server/inject_login.go

@@ -92,22 +92,14 @@ func provideGiteaLogin(config config.Config) login.Middleware {
 	if config.Gitea.Server == "" {
 		return nil
 	}
-	if config.Gitea.ClientID != "" {
-		return &gitea.Config {
-			ClientID:     config.Gitea.ClientID,
-			ClientSecret: config.Gitea.ClientSecret,
-			Server:       config.Gitea.Server,
-			Client:       defaultClient(config.Gitea.SkipVerify),
-			Logger:       logrus.StandardLogger(),
-			RedirectURL:  config.Server.Addr + "/login",
-			Scope:        config.Gitea.Scope,
-		}
-	}
-	return &gogs.Config{
-		Label:  "drone",
-		Login:  "/login/form",
-		Server: config.Gitea.Server,
-		Client: defaultClient(config.Gitea.SkipVerify),
+	return &gitea.Config {
+		ClientID:     config.Gitea.ClientID,
+		ClientSecret: config.Gitea.ClientSecret,
+		Server:       config.Gitea.Server,
+		Client:       defaultClient(config.Gitea.SkipVerify),
+		Logger:       logrus.StandardLogger(),
+		RedirectURL:  config.Server.Addr + "/login",
+		Scope:        config.Gitea.Scope,
 	}
 }
 

core/license.go

@@ -23,7 +23,7 @@ import (
 // License types.
 const (
 	LicenseFoss     = "foss"
-	LicensePeronal  = "personal"
+	LicensePersonal  = "personal"
 	LicenseStandard = "standard"
 	LicenseTrial    = "trial"
 )