From efdad4a9fc62797d89eb0d57af5fbd0b226948d4 Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Thu, 1 Sep 2022 21:35:34 +0300
Subject: [PATCH 1/4] Add option to turn on and off automatic log scrolling
 (#1149)

* Add option to turn on and off log automatic scrolling

* Use vueuse storage helper
---
 web/components.d.ts                           |  5 +++-
 web/package.json                              |  1 +
 web/src/assets/locales/en.json                |  4 ++-
 web/src/assets/locales/lv.json                |  4 ++-
 web/src/components/atomic/Icon.vue            |  8 ++++--
 .../build-feed/BuildFeedSidebar.vue           |  2 +-
 web/src/components/repo/build/BuildLog.vue    | 24 ++++++++++++++---
 web/yarn.lock                                 | 27 +++++++++++++++++++
 8 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/web/components.d.ts b/web/components.d.ts
index 3ade0da58a..594922cbac 100644
--- a/web/components.d.ts
+++ b/web/components.d.ts
@@ -37,7 +37,10 @@ declare module '@vue/runtime-core' {
     IGgTrash: typeof import('~icons/gg/trash')['default']
     IIcBaselineDarkMode: typeof import('~icons/ic/baseline-dark-mode')['default']
     IIcBaselineDownload: typeof import('~icons/ic/baseline-download')['default']
+    IIcBaselineDownloadForOffline: typeof import('~icons/ic/baseline-download-for-offline')['default']
     IIcBaselineEdit: typeof import('~icons/ic/baseline-edit')['default']
+    IIcBaselineFileDownload: typeof import('~icons/ic/baseline-file-download')['default']
+    IIcBaselineFileDownloadOff: typeof import('~icons/ic/baseline-file-download-off')['default']
     IIcBaselineHealing: typeof import('~icons/ic/baseline-healing')['default']
     IIconoirArrowLeft: typeof import('~icons/iconoir/arrow-left')['default']
     IIconParkOutlineAlarmClock: typeof import('~icons/icon-park-outline/alarm-clock')['default']
@@ -50,10 +53,10 @@ declare module '@vue/runtime-core' {
     IMdiFormatListBulleted: typeof import('~icons/mdi/format-list-bulleted')['default']
     IMdiGithub: typeof import('~icons/mdi/github')['default']
     IMdiLoading: typeof import('~icons/mdi/loading')['default']
+    IMdiSync: typeof import('~icons/mdi/sync')['default']
     IMdiSourceBranch: typeof import('~icons/mdi/source-branch')['default']
     IMdisourceCommit: typeof import('~icons/mdi/source-commit')['default']
     IMdiSourcePull: typeof import('~icons/mdi/source-pull')['default']
-    IMdiSync: typeof import('~icons/mdi/sync')['default']
     IMdiTagOutline: typeof import('~icons/mdi/tag-outline')['default']
     InputField: typeof import('./src/components/form/InputField.vue')['default']
     IOcticonSkip24: typeof import('~icons/octicon/skip24')['default']
diff --git a/web/package.json b/web/package.json
index 3d2d1f20b8..c62a2e44f3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,6 +20,7 @@
     "@intlify/vite-plugin-vue-i18n": "^6.0.0",
     "@kyvg/vue3-notification": "^2.3.6",
     "@meforma/vue-toaster": "^1.3.0",
+    "@vueuse/core": "^9.1.1",
     "ansi_up": "^5.1.0",
     "dayjs": "^1.11.4",
     "floating-vue": "^2.0.0-beta.19",
diff --git a/web/src/assets/locales/en.json b/web/src/assets/locales/en.json
index e76b58d4f1..67e23587a1 100644
--- a/web/src/assets/locales/en.json
+++ b/web/src/assets/locales/en.json
@@ -190,7 +190,9 @@
                 "canceled": "This step has been canceled.",
                 "cancel_success": "Pipeline canceled",
                 "restart_success": "Pipeline restarted",
-                "log_download": "Download"
+                "log_download": "Download",
+                "log_auto_scroll": "Automatically scroll down",
+                "log_auto_scroll_off": "Turn off automatic scrolling"
             },
             "protected": {
                 "awaits": "This pipeline is awaiting approval by some maintainer!",
diff --git a/web/src/assets/locales/lv.json b/web/src/assets/locales/lv.json
index c86da1e92b..3340b41a96 100644
--- a/web/src/assets/locales/lv.json
+++ b/web/src/assets/locales/lv.json
@@ -165,7 +165,9 @@
                 "canceled": "Šis solis tika atcelts.",
                 "cancel_success": "Konvejerdarbs atcelts",
                 "restart_success": "Konvejerdarbs pārstartēts",
-                "log_download": "Lejupielādēt"
+                "log_download": "Lejupielādēt",
+                "log_auto_scroll": "Automātiski ritināt",
+                "log_auto_scroll_off": "Atslēgt automātisko ritināšanu"
             },
             "protected": {
                 "awaits": "Šim konvejerdarbam ir nepieciešams apstiprinājums no atbildīgajām personām!",
diff --git a/web/src/components/atomic/Icon.vue b/web/src/components/atomic/Icon.vue
index 68ab566591..fcbb970820 100644
--- a/web/src/components/atomic/Icon.vue
+++ b/web/src/components/atomic/Icon.vue
@@ -36,8 +36,10 @@
   <i-mdi-chevron-right v-else-if="name === 'chevron-right'" class="h-6 w-6" />
   <i-carbon-close-outline v-else-if="name === 'close'" class="h-6 w-6" />
   <i-ic-baseline-edit v-else-if="name === 'edit'" class="h-6 w-6" />
-  <i-ic-baseline-download v-else-if="name === 'download'" class="h-6 w-6" />
+  <i-ic-baseline-download-for-offline v-else-if="name === 'download'" class="h-6 w-6" />
   <i-icon-park-outline-alarm-clock v-else-if="name === 'stopwatch'" class="h-6 w-6" />
+  <i-ic-baseline-file-download v-else-if="name === 'auto-scroll'" class="h-6 w-6" />
+  <i-ic-baseline-file-download-off v-else-if="name === 'auto-scroll-off'" class="h-6 w-6" />
   <div v-else-if="name === 'blank'" class="h-6 w-6" />
 </template>
 
@@ -84,7 +86,9 @@ export type IconNames =
   | 'close'
   | 'edit'
   | 'stopwatch'
-  | 'download';
+  | 'download'
+  | 'auto-scroll'
+  | 'auto-scroll-off';
 
 export default defineComponent({
   name: 'Icon',
diff --git a/web/src/components/build-feed/BuildFeedSidebar.vue b/web/src/components/build-feed/BuildFeedSidebar.vue
index 290dbf34f5..b11d93cd61 100644
--- a/web/src/components/build-feed/BuildFeedSidebar.vue
+++ b/web/src/components/build-feed/BuildFeedSidebar.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="isBuildFeedOpen"
-    class="flex flex-col overflow-y-auto items-center bg-white dark:bg-dark-gray-800 dark:border-dark-500"
+    class="flex flex-col z-50 overflow-y-auto items-center bg-white dark:bg-dark-gray-800 dark:border-dark-500"
   >
     <router-link
       v-for="build in sortedBuildFeed"
diff --git a/web/src/components/repo/build/BuildLog.vue b/web/src/components/repo/build/BuildLog.vue
index 52452a4fb7..296f817532 100644
--- a/web/src/components/repo/build/BuildLog.vue
+++ b/web/src/components/repo/build/BuildLog.vue
@@ -13,7 +13,7 @@
       @mouseover="showActions = true"
       @mouseleave="showActions = false"
     >
-      <div v-show="showActions" class="absolute top-0 right-0 z-50 mt-2 mr-4 hidden md:flex">
+      <div v-show="showActions" class="absolute top-0 right-0 z-40 mt-2 mr-4 hidden md:flex">
         <Button
           v-if="proc?.end_time !== undefined"
           :is-loading="downloadInProgress"
@@ -21,6 +21,12 @@
           start-icon="download"
           @click="download"
         />
+        <Button
+          v-if="proc?.end_time === undefined"
+          :title="autoScroll ? $t('repo.build.actions.log_auto_scroll_off') : $t('repo.build.actions.log_auto_scroll')"
+          :start-icon="autoScroll ? 'auto-scroll' : 'auto-scroll-off'"
+          @click="autoScroll = !autoScroll"
+        />
       </div>
 
       <div
@@ -57,6 +63,7 @@
 <script lang="ts">
 import '~/style/console.css';
 
+import { useStorage } from '@vueuse/core';
 import AnsiUp from 'ansi_up';
 import { debounce } from 'lodash';
 import { computed, defineComponent, inject, nextTick, onMounted, PropType, Ref, ref, toRef, watch } from 'vue';
@@ -120,7 +127,7 @@ export default defineComponent({
         // we do not have logs for skipped jobs
         repo?.value && build.value && proc.value && proc.value.state !== 'skipped' && proc.value.state !== 'killed',
     );
-    const autoScroll = ref(true); // TODO: allow enable / disable
+    const autoScroll = useStorage('log-auto-scroll', false);
     const showActions = ref(false);
     const downloadInProgress = ref(false);
     const ansiUp = ref(new AnsiUp());
@@ -284,7 +291,18 @@ export default defineComponent({
       }
     });
 
-    return { consoleElement, proc, log, loadedLogs, hasLogs, formatTime, showActions, download, downloadInProgress };
+    return {
+      consoleElement,
+      proc,
+      log,
+      loadedLogs,
+      hasLogs,
+      formatTime,
+      showActions,
+      download,
+      downloadInProgress,
+      autoScroll,
+    };
   },
 });
 </script>
diff --git a/web/yarn.lock b/web/yarn.lock
index f0aa7e4e86..5f7c2cb81c 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -479,6 +479,11 @@
   resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.0.tgz#a1c3809b0ad61c62cac6d4e0c56d610c910b7654"
   integrity sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==
 
+"@types/web-bluetooth@^0.0.15":
+  version "0.0.15"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.15.tgz#d60330046a6ed8a13b4a53df3813c44942ebdf72"
+  integrity sha512-w7hEHXnPMEZ+4nGKl/KDRVpxkwYxYExuHOYXyzIzCDzEZ9ZCGMAewulr9IqJu2LR4N37fcnb1XVeuZ09qgOxhA==
+
 "@typescript-eslint/eslint-plugin@^5.33.0":
   version "5.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz#059798888720ec52ffa96c5f868e31a8f70fa3ec"
@@ -709,6 +714,28 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702"
   integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==
 
+"@vueuse/core@^9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-9.1.1.tgz#a5c09c33ccee58cfd53bc3ec2d5a0d304155529e"
+  integrity sha512-QfuaNWRDMQcCUwXylCyYhPC3ScS9Tiiz4J0chdwr3vOemBwRToSywq8MP+ZegKYFnbETzRY8G/5zC+ca30wrRQ==
+  dependencies:
+    "@types/web-bluetooth" "^0.0.15"
+    "@vueuse/metadata" "9.1.1"
+    "@vueuse/shared" "9.1.1"
+    vue-demi "*"
+
+"@vueuse/metadata@9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-9.1.1.tgz#b3fe4b97e62096f7566cd8eb107c503998b2c9a6"
+  integrity sha512-XZ2KtSW+85LLHB/IdGILPAtbIVHasPsAW7aqz3BRMzJdAQWRiM/FGa1OKBwLbXtUw/AmjKYFlZJo7eOFIBXRog==
+
+"@vueuse/shared@9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-9.1.1.tgz#811f47629e281a19013ae6dcdf11ed3e1e91e023"
+  integrity sha512-c+IfcOYmHiHqoEa3ED1Tbpue5GHmoUmTp8PtO4YbczthtY155Rt6DmWhjxMLXBF1Bcidagxljmp/7xtAzEHXLw==
+  dependencies:
+    vue-demi "*"
+
 "@windicss/config@1.8.7":
   version "1.8.7"
   resolved "https://registry.yarnpkg.com/@windicss/config/-/config-1.8.7.tgz#650bec3c6e3293306e4fe0c478253bd0085884aa"

From 3f2af06bbcc2f69776bb4b58bc3d6883027315f7 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 1 Sep 2022 22:48:33 +0200
Subject: [PATCH 2/4] Respect WOODPECKER_GITEA_SKIP_VERIFY (#1152)

---
 server/remote/gitea/gitea.go | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/server/remote/gitea/gitea.go b/server/remote/gitea/gitea.go
index e61ade7220..d72f08a72e 100644
--- a/server/remote/gitea/gitea.go
+++ b/server/remote/gitea/gitea.go
@@ -27,6 +27,7 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"code.gitea.io/sdk/gitea"
 	"github.com/rs/zerolog/log"
@@ -84,22 +85,27 @@ func (c *Gitea) Name() string {
 	return "gitea"
 }
 
-func (c *Gitea) oauth2Config() *oauth2.Config {
+func (c *Gitea) oauth2Config(ctx context.Context) (*oauth2.Config, context.Context) {
 	return &oauth2.Config{
-		ClientID:     c.ClientID,
-		ClientSecret: c.ClientSecret,
-		Endpoint: oauth2.Endpoint{
-			AuthURL:  fmt.Sprintf(authorizeTokenURL, c.URL),
-			TokenURL: fmt.Sprintf(accessTokenURL, c.URL),
+			ClientID:     c.ClientID,
+			ClientSecret: c.ClientSecret,
+			Endpoint: oauth2.Endpoint{
+				AuthURL:  fmt.Sprintf(authorizeTokenURL, c.URL),
+				TokenURL: fmt.Sprintf(accessTokenURL, c.URL),
+			},
+			RedirectURL: fmt.Sprintf("%s/authorize", server.Config.Server.OAuthHost),
 		},
-		RedirectURL: fmt.Sprintf("%s/authorize", server.Config.Server.OAuthHost),
-	}
+
+		context.WithValue(ctx, oauth2.HTTPClient, &http.Client{Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipVerify},
+			Proxy:           http.ProxyFromEnvironment,
+		}})
 }
 
 // Login authenticates an account with Gitea using basic authentication. The
 // Gitea account details are returned when the user is successfully authenticated.
 func (c *Gitea) Login(ctx context.Context, w http.ResponseWriter, req *http.Request) (*model.User, error) {
-	config := c.oauth2Config()
+	config, oauth2Ctx := c.oauth2Config(ctx)
 
 	// get the OAuth errors
 	if err := req.FormValue("error"); err != "" {
@@ -117,7 +123,7 @@ func (c *Gitea) Login(ctx context.Context, w http.ResponseWriter, req *http.Requ
 		return nil, nil
 	}
 
-	token, err := config.Exchange(ctx, code)
+	token, err := config.Exchange(oauth2Ctx, code)
 	if err != nil {
 		return nil, err
 	}
@@ -158,10 +164,14 @@ func (c *Gitea) Auth(ctx context.Context, token, secret string) (string, error)
 // Refresh refreshes the Gitea oauth2 access token. If the token is
 // refreshed the user is updated and a true value is returned.
 func (c *Gitea) Refresh(ctx context.Context, user *model.User) (bool, error) {
-	config := c.oauth2Config()
+	config, oauth2Ctx := c.oauth2Config(ctx)
 	config.RedirectURL = ""
 
-	source := config.TokenSource(ctx, &oauth2.Token{RefreshToken: user.Secret})
+	source := config.TokenSource(oauth2Ctx, &oauth2.Token{
+		AccessToken:  user.Token,
+		RefreshToken: user.Secret,
+		Expiry:       time.Unix(user.Expiry, 0),
+	})
 
 	token, err := source.Token()
 	if err != nil || len(token.AccessToken) == 0 {

From 4afddc2821920e49da06e699be5795d6d4779d06 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Fri, 2 Sep 2022 16:41:51 +0200
Subject: [PATCH 3/4] Extract commit message from branch creation (#1150)

if commit already exist

close https://codeberg.org/Codeberg-CI/feedback/issues/52
---
 server/remote/gitea/fixtures/hooks.go | 149 ++++++++++++++++++++++++++
 server/remote/gitea/helper.go         |   6 ++
 server/remote/gitea/parse_test.go     |  15 +++
 server/remote/gitea/types.go          |  20 ++--
 web/components.d.ts                   |   3 +-
 5 files changed, 183 insertions(+), 10 deletions(-)

diff --git a/server/remote/gitea/fixtures/hooks.go b/server/remote/gitea/fixtures/hooks.go
index 30f1905326..ced923d0cc 100644
--- a/server/remote/gitea/fixtures/hooks.go
+++ b/server/remote/gitea/fixtures/hooks.go
@@ -69,6 +69,155 @@ const HookPush = `
 }
 `
 
+// HookPushBranch is a sample Gitea push hook where a new branch was created from an existing commit
+const HookPushBranch = `
+{
+  "ref": "refs/heads/fdsafdsa",
+  "before": "0000000000000000000000000000000000000000",
+  "after": "28c3613ae62640216bea5e7dc71aa65356e4298b",
+  "compare_url": "https://codeberg.org/meisam/woodpecktester/compare/master...28c3613ae62640216bea5e7dc71aa65356e4298b",
+  "commits": [],
+  "head_commit": {
+    "id": "28c3613ae62640216bea5e7dc71aa65356e4298b",
+    "message": "Delete '.woodpecker/.check.yml'\n",
+    "url": "https://codeberg.org/meisam/woodpecktester/commit/28c3613ae62640216bea5e7dc71aa65356e4298b",
+    "author": {
+      "name": "meisam",
+      "email": "meisam@noreply.codeberg.org",
+      "username": "meisam"
+    },
+    "committer": {
+      "name": "meisam",
+      "email": "meisam@noreply.codeberg.org",
+      "username": "meisam"
+    },
+    "verification": null,
+    "timestamp": "2022-07-12T21:09:27+02:00",
+    "added": [],
+    "removed": [
+      ".woodpecker/.check.yml"
+    ],
+    "modified": []
+  },
+  "repository": {
+    "id": 50820,
+    "owner": {
+      "id": 14844,
+      "login": "meisam",
+      "full_name": "",
+      "email": "meisam@noreply.codeberg.org",
+      "avatar_url": "https://codeberg.org/avatars/96512da76a14cf44e0bb32d1640e878e",
+      "language": "",
+      "is_admin": false,
+      "last_login": "0001-01-01T00:00:00Z",
+      "created": "2020-10-08T11:19:12+02:00",
+      "restricted": false,
+      "active": false,
+      "prohibit_login": false,
+      "location": "",
+      "website": "",
+      "description": "Materials engineer, physics enthusiast, large collection of the bad programming habits, always happy to fix the old ones and make new mistakes!",
+      "visibility": "public",
+      "followers_count": 0,
+      "following_count": 0,
+      "starred_repos_count": 0,
+      "username": "meisam"
+    },
+    "name": "woodpecktester",
+    "full_name": "meisam/woodpecktester",
+    "description": "Just for testing the Woodpecker CI and reporting bugs",
+    "empty": false,
+    "private": false,
+    "fork": false,
+    "template": false,
+    "parent": null,
+    "mirror": false,
+    "size": 367,
+    "language": "",
+    "languages_url": "https://codeberg.org/api/v1/repos/meisam/woodpecktester/languages",
+    "html_url": "https://codeberg.org/meisam/woodpecktester",
+    "ssh_url": "git@codeberg.org:meisam/woodpecktester.git",
+    "clone_url": "https://codeberg.org/meisam/woodpecktester.git",
+    "original_url": "",
+    "website": "",
+    "stars_count": 0,
+    "forks_count": 0,
+    "watchers_count": 1,
+    "open_issues_count": 0,
+    "open_pr_counter": 0,
+    "release_counter": 0,
+    "default_branch": "master",
+    "archived": false,
+    "created_at": "2022-07-04T00:34:39+02:00",
+    "updated_at": "2022-07-24T20:31:29+02:00",
+    "permissions": {
+      "admin": true,
+      "push": true,
+      "pull": true
+    },
+    "has_issues": true,
+    "internal_tracker": {
+      "enable_time_tracker": true,
+      "allow_only_contributors_to_track_time": true,
+      "enable_issue_dependencies": true
+    },
+    "has_wiki": true,
+    "has_pull_requests": true,
+    "has_projects": true,
+    "ignore_whitespace_conflicts": false,
+    "allow_merge_commits": true,
+    "allow_rebase": true,
+    "allow_rebase_explicit": true,
+    "allow_squash_merge": true,
+    "default_merge_style": "merge",
+    "avatar_url": "",
+    "internal": false,
+    "mirror_interval": "",
+    "mirror_updated": "0001-01-01T00:00:00Z",
+    "repo_transfer": null
+  },
+  "pusher": {
+    "id": 2628,
+    "login": "6543",
+    "full_name": "",
+    "email": "6543@obermui.de",
+    "avatar_url": "https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173",
+    "language": "",
+    "is_admin": false,
+    "last_login": "0001-01-01T00:00:00Z",
+    "created": "2019-10-12T05:05:49+02:00",
+    "restricted": false,
+    "active": false,
+    "prohibit_login": false,
+    "location": "",
+    "visibility": "public",
+    "followers_count": 22,
+    "following_count": 16,
+    "starred_repos_count": 55,
+    "username": "6543"
+  },
+  "sender": {
+    "id": 2628,
+    "login": "6543",
+    "full_name": "",
+    "email": "6543@obermui.de",
+    "avatar_url": "https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173",
+    "language": "",
+    "is_admin": false,
+    "last_login": "0001-01-01T00:00:00Z",
+    "created": "2019-10-12T05:05:49+02:00",
+    "restricted": false,
+    "active": false,
+    "prohibit_login": false,
+    "visibility": "public",
+    "followers_count": 22,
+    "following_count": 16,
+    "starred_repos_count": 55,
+    "username": "6543"
+  }
+}
+`
+
 // HookPushTag is a sample Gitea tag hook
 const HookPushTag = `{
   "sha": "ef98532add3b2feb7a137426bba1248724367df5",
diff --git a/server/remote/gitea/helper.go b/server/remote/gitea/helper.go
index 1132bb33b8..3712a3a49c 100644
--- a/server/remote/gitea/helper.go
+++ b/server/remote/gitea/helper.go
@@ -84,6 +84,8 @@ func buildFromPush(hook *pushHook) *model.Build {
 	link := hook.Compare
 	if len(hook.Commits) > 0 {
 		message = hook.Commits[0].Message
+	} else {
+		message = hook.HeadCommit.Message
 	}
 
 	if len(hook.Commits) == 1 {
@@ -115,6 +117,10 @@ func getChangedFilesFromPushHook(hook *pushHook) []string {
 		files = append(files, c.Modified...)
 	}
 
+	files = append(files, hook.HeadCommit.Added...)
+	files = append(files, hook.HeadCommit.Removed...)
+	files = append(files, hook.HeadCommit.Modified...)
+
 	return utils.DedupStrings(files)
 }
 
diff --git a/server/remote/gitea/parse_test.go b/server/remote/gitea/parse_test.go
index 3193fd593a..1f6b83578c 100644
--- a/server/remote/gitea/parse_test.go
+++ b/server/remote/gitea/parse_test.go
@@ -53,5 +53,20 @@ func Test_parser(t *testing.T) {
 				g.Assert(utils.EqualStringSlice(b.ChangedFiles, []string{"CHANGELOG.md", "app/controller/application.rb"})).IsTrue()
 			})
 		})
+		g.Describe("given a push hook from an branch creation", func() {
+			g.It("should extract repository and build details", func() {
+				buf := bytes.NewBufferString(fixtures.HookPushBranch)
+				req, _ := http.NewRequest("POST", "/hook", buf)
+				req.Header = http.Header{}
+				req.Header.Set(hookEvent, hookPush)
+				r, b, err := parseHook(req)
+				g.Assert(err).IsNil()
+				g.Assert(r).IsNotNil()
+				g.Assert(b).IsNotNil()
+				g.Assert(b.Event).Equal(model.EventPush)
+				g.Assert(b.Message).Equal("Delete '.woodpecker/.check.yml'\n")
+				g.Assert(b.ChangedFiles).Equal([]string{".woodpecker/.check.yml"})
+			})
+		})
 	})
 }
diff --git a/server/remote/gitea/types.go b/server/remote/gitea/types.go
index e7c87cadb6..c045ce25c0 100644
--- a/server/remote/gitea/types.go
+++ b/server/remote/gitea/types.go
@@ -14,6 +14,15 @@
 
 package gitea
 
+type commit struct {
+	ID       string   `json:"id"`
+	Message  string   `json:"message"`
+	URL      string   `json:"url"`
+	Added    []string `json:"added"`
+	Removed  []string `json:"removed"`
+	Modified []string `json:"modified"`
+}
+
 type pushHook struct {
 	Sha     string `json:"sha"`
 	Ref     string `json:"ref"`
@@ -42,14 +51,9 @@ type pushHook struct {
 		} `json:"owner"`
 	} `json:"repository"`
 
-	Commits []struct {
-		ID       string   `json:"id"`
-		Message  string   `json:"message"`
-		URL      string   `json:"url"`
-		Added    []string `json:"added"`
-		Removed  []string `json:"removed"`
-		Modified []string `json:"modified"`
-	} `json:"commits"`
+	Commits []commit `json:"commits"`
+
+	HeadCommit commit `json:"head_commit"`
 
 	Sender struct {
 		ID       int64  `json:"id"`
diff --git a/web/components.d.ts b/web/components.d.ts
index 594922cbac..1c8f8ad674 100644
--- a/web/components.d.ts
+++ b/web/components.d.ts
@@ -36,7 +36,6 @@ declare module '@vue/runtime-core' {
     IEntypoDotsTwoVertical: typeof import('~icons/entypo/dots-two-vertical')['default']
     IGgTrash: typeof import('~icons/gg/trash')['default']
     IIcBaselineDarkMode: typeof import('~icons/ic/baseline-dark-mode')['default']
-    IIcBaselineDownload: typeof import('~icons/ic/baseline-download')['default']
     IIcBaselineDownloadForOffline: typeof import('~icons/ic/baseline-download-for-offline')['default']
     IIcBaselineEdit: typeof import('~icons/ic/baseline-edit')['default']
     IIcBaselineFileDownload: typeof import('~icons/ic/baseline-file-download')['default']
@@ -53,10 +52,10 @@ declare module '@vue/runtime-core' {
     IMdiFormatListBulleted: typeof import('~icons/mdi/format-list-bulleted')['default']
     IMdiGithub: typeof import('~icons/mdi/github')['default']
     IMdiLoading: typeof import('~icons/mdi/loading')['default']
-    IMdiSync: typeof import('~icons/mdi/sync')['default']
     IMdiSourceBranch: typeof import('~icons/mdi/source-branch')['default']
     IMdisourceCommit: typeof import('~icons/mdi/source-commit')['default']
     IMdiSourcePull: typeof import('~icons/mdi/source-pull')['default']
+    IMdiSync: typeof import('~icons/mdi/sync')['default']
     IMdiTagOutline: typeof import('~icons/mdi/tag-outline')['default']
     InputField: typeof import('./src/components/form/InputField.vue')['default']
     IOcticonSkip24: typeof import('~icons/octicon/skip24')['default']

From 7db7e97f3fb6cb9a606951f947fbc532373ad368 Mon Sep 17 00:00:00 2001
From: Anbraten <anton@ju60.de>
Date: Fri, 2 Sep 2022 22:14:38 +0200
Subject: [PATCH 4/4] fix (auto) cancel of blocked pipelines (#1157)

---
 server/pipeline/cancel.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/pipeline/cancel.go b/server/pipeline/cancel.go
index a6e3cf39c2..262bc59a76 100644
--- a/server/pipeline/cancel.go
+++ b/server/pipeline/cancel.go
@@ -29,8 +29,8 @@ import (
 
 // Cancel the build and returns the status.
 func Cancel(ctx context.Context, store store.Store, repo *model.Repo, build *model.Build) error {
-	if build.Status != model.StatusRunning && build.Status != model.StatusPending {
-		return ErrBadRequest{Msg: "Cannot cancel a non-running or non-pending build"}
+	if build.Status != model.StatusRunning && build.Status != model.StatusPending && build.Status != model.StatusBlocked {
+		return ErrBadRequest{Msg: "Cannot cancel a non-running or non-pending or non-blocked build"}
 	}
 
 	procs, err := store.ProcList(build)