mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-10-24 15:23:49 +02:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec85f8e9bf | ||
|
|
793ea4bec3 | ||
|
|
5395cf700d | ||
|
|
9696123c42 | ||
|
|
36e5d61564 | ||
|
|
55cd923ead | ||
|
|
def77fa66d | ||
|
|
ee936bdd8f | ||
|
|
df7a149a4e | ||
|
|
1d503644eb | ||
|
|
0b5dcbb8a7 | ||
|
|
df4840729c | ||
|
|
fcd469daab |
7
.github/lock.yml
vendored
Normal file
7
.github/lock.yml
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
# Configuration for Lock Threads - https://github.com/dessant/lock-threads
|
||||
|
||||
# Number of days of inactivity before a closed issue or pull request is locked
|
||||
daysUntilLock: 3
|
||||
|
||||
# Comment to post before locking. Set to `false` to disable
|
||||
lockComment: false
|
||||
@@ -11,7 +11,7 @@ diff --git a/build/release.mk b/build/release.mk
|
||||
index 238343e..1b7859f 100644
|
||||
--- a/build/release.mk
|
||||
+++ b/build/release.mk
|
||||
@@ -66,7 +66,7 @@ endif
|
||||
@@ -70,7 +70,7 @@ endif
|
||||
done
|
||||
|
||||
@# ----- PLATFORM SPECIFIC -----
|
||||
@@ -20,10 +20,10 @@ index 238343e..1b7859f 100644
|
||||
@# Make osx package
|
||||
@# Copy binary
|
||||
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
|
||||
@@ -96,7 +96,7 @@ endif
|
||||
@# Cleanup
|
||||
@@ -110,7 +110,7 @@ endif
|
||||
rm -f $(DIST_PATH)/bin/mattermost.exe
|
||||
rm -f $(DIST_PATH)/bin/platform.exe
|
||||
rm -f $(DIST_PATH)/prepackaged_plugins/*
|
||||
-
|
||||
+package-linux: package
|
||||
@# Make linux package
|
||||
|
||||
8
build.sh
8
build.sh
@@ -31,9 +31,9 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
|
||||
apt-get update
|
||||
# dependencies to setup repositories
|
||||
apt-get install --quiet \
|
||||
gnupg2 dirmngr apt-transport-https ca-certificates
|
||||
# receive missing key
|
||||
apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys "${NODE_KEY}"
|
||||
gnupg2 dirmngr apt-transport-https ca-certificates parallel
|
||||
# receive missing key (retry on failure)
|
||||
parallel --verbose --delay=30 --retries=5 "apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys '{}'" ::: "${NODE_KEY}"
|
||||
# add required additional repositories
|
||||
printf 'deb-src http://deb.debian.org/debian %s main' "${DEBIAN_RELEASE}" \
|
||||
> "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-source.list"
|
||||
@@ -88,6 +88,8 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
|
||||
fi
|
||||
patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
|
||||
--strip=1 < "${HOME}/build-release.patch"
|
||||
patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
|
||||
--strip=1 < "${HOME}/go-backport.patch"
|
||||
make --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
|
||||
config-reset build-linux package-linux \
|
||||
BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \
|
||||
|
||||
64
dependabot/Gopkg.lock
generated
64
dependabot/Gopkg.lock
generated
@@ -9,6 +9,22 @@
|
||||
revision = "2ee87856327ba09384cabd113bc6b5d174e9ec0f"
|
||||
version = "v3.5.1"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
digest = "1:b89d54b3534c2a85153cc60a39e1a9764f9cc6c7b3d1b31265fd53cd70ea77dd"
|
||||
name = "github.com/dyatlov/go-opengraph"
|
||||
packages = ["opengraph"]
|
||||
pruneopts = ""
|
||||
revision = "816b6608b3c8c1e871bc9cf777f390e2532081fe"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:255e3d4847203dc43313d40727f336832a99170226c6136a7b943750b865528e"
|
||||
name = "github.com/go-ldap/ldap"
|
||||
packages = ["."]
|
||||
pruneopts = ""
|
||||
revision = "729c20c2694d870bcd631f0dadaecd088bd7ccbc"
|
||||
version = "v3.0.2"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:5247b135b5492aa232a731acdcb52b08f32b874cb398f21ab460396eadbe866b"
|
||||
name = "github.com/google/uuid"
|
||||
@@ -26,23 +42,31 @@
|
||||
revision = "483fb8d7c32fcb4b5636cd293a92e3935932e2f4"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:1dd3cd1e9cee3f3851ebfe67b896a24d9a625114c2bc8d4236dabbd55f263b15"
|
||||
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
|
||||
name = "github.com/mattermost/go-i18n"
|
||||
packages = ["i18n"]
|
||||
pruneopts = ""
|
||||
revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
|
||||
version = "v1.10.0"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:1029ff6d4f99257d985b07b70d492dc8a9e33cc577bc5403444277efc5328b1d"
|
||||
name = "github.com/mattermost/mattermost-server"
|
||||
packages = [
|
||||
"mlog",
|
||||
"model",
|
||||
"services/timezones",
|
||||
"utils/jsonutils",
|
||||
"utils/markdown",
|
||||
]
|
||||
pruneopts = ""
|
||||
revision = "0c1207215852a8726c3f09dea157d597fec368df"
|
||||
version = "v5.6.0"
|
||||
revision = "f8469de7724a9449b43b514a99acefaf02430ad9"
|
||||
version = "v5.13.0"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
|
||||
name = "github.com/nicksnyder/go-i18n"
|
||||
packages = [
|
||||
"i18n",
|
||||
"i18n/bundle",
|
||||
"i18n/language",
|
||||
"i18n/translation",
|
||||
@@ -117,6 +141,38 @@
|
||||
pruneopts = ""
|
||||
revision = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
digest = "1:4f7cbb08d72e1163302e2d21415200a7bc281653f5f34eda8a15c0da11a337b0"
|
||||
name = "golang.org/x/net"
|
||||
packages = [
|
||||
"html",
|
||||
"html/atom",
|
||||
]
|
||||
pruneopts = ""
|
||||
revision = "3a22650c66bd7f4fb6d1e8072ffd7b75c8a27898"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4"
|
||||
name = "golang.org/x/text"
|
||||
packages = [
|
||||
"internal/gen",
|
||||
"internal/tag",
|
||||
"language",
|
||||
"unicode/cldr",
|
||||
]
|
||||
pruneopts = ""
|
||||
revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
|
||||
version = "v0.3.0"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:039b95e6ba078fe5a22315dcae7bc9859226ee34672ce9ab01708576bf2abd38"
|
||||
name = "gopkg.in/asn1-ber.v1"
|
||||
packages = ["."]
|
||||
pruneopts = ""
|
||||
revision = "f715ec2f112d1e4195b827ad68cf44017a3ef2b1"
|
||||
version = "v1.3"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:11c58e19ff7ce22740423bb933f1ddca3bf575def40d5ac3437ec12871b1648b"
|
||||
name = "gopkg.in/natefinch/lumberjack.v2"
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
[[constraint]]
|
||||
name = "github.com/mattermost/mattermost-server"
|
||||
version = "v5.6.0"
|
||||
version = "v5.13.0"
|
||||
|
||||
27
go-backport.patch
Normal file
27
go-backport.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
From 556e16211ed1b4c146ca2a094688618458182ae7 Mon Sep 17 00:00:00 2001
|
||||
From: Your Name <you@example.com>
|
||||
Date: Wed, 6 Jun 2018 12:34:56 +0100
|
||||
Subject: [PATCH] go 1.11 backport
|
||||
|
||||
---
|
||||
store/sqlstore/channel_store.go | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go
|
||||
index cf63c706d..dae7c8c9c 100644
|
||||
--- a/store/sqlstore/channel_store.go
|
||||
+++ b/store/sqlstore/channel_store.go
|
||||
@@ -2156,9 +2156,9 @@ func (s SqlChannelStore) SearchAllChannels(term string, opts store.ChannelSearch
|
||||
|
||||
likeClause, likeTerm := s.buildLIKEClause(term, "c.Name, c.DisplayName, c.Purpose")
|
||||
if len(likeTerm) > 0 {
|
||||
- likeClause = strings.ReplaceAll(likeClause, ":LikeTerm", "'"+likeTerm+"'")
|
||||
+ likeClause = strings.Replace(likeClause, ":LikeTerm", "'"+likeTerm+"'", -1)
|
||||
fulltextClause, fulltextTerm := s.buildFulltextClause(term, "c.Name, c.DisplayName, c.Purpose")
|
||||
- fulltextClause = strings.ReplaceAll(fulltextClause, ":FulltextTerm", "'"+fulltextTerm+"'")
|
||||
+ fulltextClause = strings.Replace(fulltextClause, ":FulltextTerm", "'"+fulltextTerm+"'", -1)
|
||||
query = query.Where("(" + likeClause + " OR " + fulltextClause + ")")
|
||||
}
|
||||
|
||||
--
|
||||
2.11.0
|
||||
Reference in New Issue
Block a user