Skip to content

Commit

Permalink
Merge branch 'main' into refactor-user-active
Browse files Browse the repository at this point in the history
  • Loading branch information
GiteaBot authored Feb 25, 2024
2 parents 92a34ad + ed3892d commit 09d6e03
Show file tree
Hide file tree
Showing 20 changed files with 754 additions and 159 deletions.
2 changes: 1 addition & 1 deletion .stylelintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ rules:
at-rule-allowed-list: null
at-rule-disallowed-list: null
at-rule-empty-line-before: null
at-rule-no-unknown: true
at-rule-no-unknown: [true, {ignoreAtRules: [tailwind]}]
at-rule-no-vendor-prefix: true
at-rule-property-required-list: null
block-no-empty: true
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/m
FOMANTIC_WORK_DIR := web_src/fomantic

WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
WEBPACK_CONFIGS := webpack.config.js
WEBPACK_CONFIGS := webpack.config.js tailwind.config.js
WEBPACK_DEST := public/assets/js/index.js public/assets/css/index.css
WEBPACK_DEST_ENTRIES := public/assets/js public/assets/css public/assets/fonts public/assets/img/webpack

Expand Down
2 changes: 2 additions & 0 deletions modules/packages/alpine/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ const (

RepositoryPackage = "_alpine"
RepositoryVersion = "_repository"

NoArch = "noarch"
)

// https://wiki.alpinelinux.org/wiki/Apk_spec
Expand Down
Loading

0 comments on commit 09d6e03

Please sign in to comment.