1
0
mirror of https://github.com/SmartHoneybee/ubiquitous-memory synced 2025-10-24 15:23:49 +02:00

Compare commits

...

30 Commits

Author SHA1 Message Date
dependabot-preview[bot]
df047ff1c3 Bump github.com/mattermost/mattermost-server/v5 from 5.28.1 to 5.29.0 in /dependabot (#95)
Bump github.com/mattermost/mattermost-server/v5 in /dependabot

Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.28.1 to 5.29.0.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.28.1...v5.29.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>
2020-11-21 14:30:01 +00:00
parnic-sks
34f7ec2895 Update to Mattermost 5.28.1 (#94)
* Update to Mattermost 5.28.1

* Update release.mk patch for 5.28

* Repair to original patch text

* Run patch in batch mode

* Try to fix patch file

I'm having a hard time understanding why this is not working on CI.

* Working 5.28.1 release.mk patch

I was previously working off mattermost-server HEAD's copy of release.mk which has apparently changed since 5.28.1, so future PRs will need to make more changes to this patch. But for now, this should allow the patch to be applied.
2020-10-23 15:34:25 +00:00
dependabot-preview[bot]
04f32e9214 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#93) 2020-09-15 04:01:06 +00:00
dependabot-preview[bot]
e4b062a7f4 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#92) 2020-09-04 04:14:16 +00:00
dependabot-preview[bot]
fae0f5b8b6 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#91) 2020-08-28 23:10:00 +00:00
dependabot-preview[bot]
608535bba2 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#90) 2020-08-13 04:01:47 +00:00
dependabot-preview[bot]
1ff3276ef1 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#89) 2020-08-05 17:30:27 +00:00
dependabot-preview[bot]
9b99cea31b Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#88) 2020-07-25 08:59:59 +00:00
dependabot-preview[bot]
0f99d5847c Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#87) 2020-07-16 04:05:07 +00:00
dependabot-preview[bot]
f16cacf3ea Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#86) 2020-07-02 19:43:30 +00:00
dependabot-preview[bot]
6ef90eb436 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#85) 2020-06-22 03:55:32 +00:00
dependabot-preview[bot]
06a96e5cdf Bump github.com/mattermost/mattermost-server/v5 from 5.23.0 to 5.23.1 in /dependabot (#83)
Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.23.0 to 5.23.1.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.23.0...v5.23.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-11 15:27:57 +00:00
dependabot-preview[bot]
f3192dba71 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#82) 2020-05-15 04:04:51 +00:00
dependabot-preview[bot]
ca10b305e4 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#81) 2020-05-12 04:01:23 +00:00
dependabot-preview[bot]
475839128e Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#80) 2020-05-06 21:53:39 +00:00
dependabot-preview[bot]
ec8de37859 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#79) 2020-04-23 21:32:17 +00:00
dependabot-preview[bot]
5e267c639f Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#78) 2020-04-16 16:52:18 +00:00
dependabot-preview[bot]
3afd62ebaa Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#77) 2020-03-16 03:46:40 +00:00
dependabot-preview[bot]
4449fd0723 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#76) 2020-03-13 03:35:28 +00:00
dependabot-preview[bot]
6f1748b909 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#75) 2020-02-17 03:47:07 +00:00
dependabot-preview[bot]
5e14b05358 Bump github.com/mattermost/mattermost-server/v5 from 5.19.1 to 5.20.0 in /dependabot (#74)
Bump github.com/mattermost/mattermost-server/v5 in /dependabot

Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.19.1 to 5.20.0.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.19.1...v5.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-15 16:19:48 +00:00
dependabot-preview[bot]
c696751a66 Bump github.com/mattermost/mattermost-server/v5 from 5.19.0 to 5.19.1 in /dependabot (#72)
Bump github.com/mattermost/mattermost-server/v5 in /dependabot

Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.19.0 to 5.19.1.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.19.0...v5.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-31 20:35:52 +00:00
kartoffelsalat
9b16070789 version 5.19.1 (#71) 2020-01-23 20:00:24 +00:00
dependabot-preview[bot]
ab54cd5f53 Bump github.com/mattermost/mattermost-server in /dependabot (#70) 2020-01-08 21:44:47 +00:00
dependabot-preview[bot]
0e12504498 Bump github.com/mattermost/mattermost-server from 5.17.1 to 5.17.2 in /dependabot (#69)
Bump github.com/mattermost/mattermost-server in /dependabot

Bumps [github.com/mattermost/mattermost-server](https://github.com/mattermost/mattermost-server) from 5.17.1 to 5.17.2.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.17.1...v5.17.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-19 14:39:56 +00:00
dependabot-preview[bot]
4e3ab42325 Bump github.com/mattermost/mattermost-server in /dependabot (#68) 2019-11-26 22:34:55 +00:00
dependabot-preview[bot]
44df1cad21 Bump github.com/mattermost/mattermost-server in /dependabot (#67) 2019-11-17 16:01:41 +00:00
dependabot-preview[bot]
0f76d17e4b Bump github.com/mattermost/mattermost-server in /dependabot (#66) 2019-11-07 00:44:12 +00:00
dependabot-preview[bot]
b825885790 Bump github.com/mattermost/mattermost-server in /dependabot (#65) 2019-11-03 17:41:48 +00:00
dependabot-preview[bot]
1aab309dbe Bump github.com/mattermost/mattermost-server in /dependabot (#64) 2019-10-25 06:36:54 +00:00
10 changed files with 38 additions and 259 deletions

7
.github/lock.yml vendored
View File

@@ -1,7 +0,0 @@
# 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

15
.github/workflows/lock.yml vendored Normal file
View File

@@ -0,0 +1,15 @@
name: 'Lock threads'
on:
schedule:
- cron: '0 0 * * *'
jobs:
lock:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v2
with:
github-token: ${{ github.token }}
issue-lock-inactive-days: 3
pr-lock-inactive-days: 3

View File

@@ -1,11 +1,11 @@
language: c
dist: trusty
sudo: required
service:
os: linux
dist: bionic
services:
- docker
env:
global:
- DEBIAN_RELEASE='stretch'
- DEBIAN_RELEASE='buster'
- DOCKER_PWD='/root'
- DOCKER_IMAGE="debian:${DEBIAN_RELEASE}"
matrix:
@@ -26,7 +26,7 @@ env:
- GOOS='openbsd' GOARCH='amd64'
- GOOS='openbsd' GOARCH='arm'
before_install:
- export MATTERMOST_RELEASE="$(grep 'version' dependabot/Gopkg.toml | cut -d'"' -f2)"
- export MATTERMOST_RELEASE="$(grep 'mattermost' dependabot/go.mod | cut -d' ' -f3)"
- docker pull "${DOCKER_IMAGE}"
- chmod +x build.sh
script:

View File

@@ -1,18 +1,9 @@
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] Split make goal
---
build/release.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/release.mk b/build/release.mk
index 238343e..1b7859f 100644
index 1172509..219db00 100644
--- a/build/release.mk
+++ b/build/release.mk
@@ -70,7 +70,7 @@ endif
done
@@ -123,7 +123,7 @@ endif
@# ----- PLATFORM SPECIFIC -----
-
@@ -20,14 +11,20 @@ index 238343e..1b7859f 100644
@# Make osx package
@# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
@@ -110,7 +110,7 @@ endif
rm -f $(DIST_PATH)/bin/mattermost.exe
@@ -191,7 +191,7 @@ endif
rm -f $(DIST_PATH)/bin/platform.exe
rm -f $(DIST_PATH)/bin/mmctl.exe
rm -f $(DIST_PATH)/prepackaged_plugins/*
-
+package-linux: package
@# Make linux package
@# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
--
2.11.0
@@ -201,7 +201,6 @@ else
cp $(GOBIN)/linux_amd64/mattermost $(DIST_PATH)/bin # from cross-compiled bin dir
cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
endif
- MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://releases.mattermost.com/mmctl/v5.28.0/$$MMCTL_FILE && tar -xvf $$MMCTL_FILE -C $(DIST_PATH)/bin && rm $$MMCTL_FILE
@# Prepackage plugins
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
ARCH="linux-amd64"; \

View File

@@ -88,9 +88,7 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
"${HOME}/go/bin/linux_amd64"
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"
--strip=1 -t < "${HOME}/build-release.patch"
sed -i \
-e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \
-e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \

197
dependabot/Gopkg.lock generated
View File

@@ -1,197 +0,0 @@
# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
[[projects]]
digest = "1:79421244ba5848aae4b0a5c41e633a04e4894cb0b164a219dc8c15ec7facb7f1"
name = "github.com/blang/semver"
packages = ["."]
pruneopts = ""
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:5247b135b5492aa232a731acdcb52b08f32b874cb398f21ab460396eadbe866b"
name = "github.com/google/uuid"
packages = ["."]
pruneopts = ""
revision = "d460ce9f8df2e77fb1ba55ca87fafed96c607494"
version = "v1.0.0"
[[projects]]
branch = "master"
digest = "1:ad21af51a0276292e9f6f5c37b966630138986478b1ecdbb94b907168fe25281"
name = "github.com/gorilla/websocket"
packages = ["."]
pruneopts = ""
revision = "483fb8d7c32fcb4b5636cd293a92e3935932e2f4"
[[projects]]
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
name = "github.com/mattermost/go-i18n"
packages = ["i18n"]
pruneopts = ""
revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
version = "v1.10.0"
[[projects]]
digest = "1:e2df3d086086eadfe8ef94d8f1f333d75b5332987b4c6116f5df8d6bf2a69417"
name = "github.com/mattermost/ldap"
packages = ["."]
pruneopts = ""
revision = "fee0a369f21be68ea3d647c0da8272a352fa1528"
version = "v3.0.4"
[[projects]]
digest = "1:956bb9e1bca6146cea0047ea6cbdc65c36c871285efb7455d94bb06e786fc71d"
name = "github.com/mattermost/mattermost-server"
packages = [
"mlog",
"model",
"services/timezones",
"utils/jsonutils",
"utils/markdown",
]
pruneopts = ""
revision = "6597fdb40134965e26f715854dc85f5e6cfaa6df"
version = "v5.16.0"
[[projects]]
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
name = "github.com/nicksnyder/go-i18n"
packages = [
"i18n/bundle",
"i18n/language",
"i18n/translation",
]
pruneopts = ""
revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
version = "v1.10.0"
[[projects]]
digest = "1:a5484d4fa43127138ae6e7b2299a6a52ae006c7f803d98d717f60abf3e97192e"
name = "github.com/pborman/uuid"
packages = ["."]
pruneopts = ""
revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1"
version = "v1.2"
[[projects]]
digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457"
name = "github.com/pelletier/go-toml"
packages = ["."]
pruneopts = ""
revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
version = "v1.2.0"
[[projects]]
digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
name = "github.com/pkg/errors"
packages = ["."]
pruneopts = ""
revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
version = "v0.8.0"
[[projects]]
digest = "1:74f86c458e82e1c4efbab95233e0cf51b7cc02dc03193be9f62cd81224e10401"
name = "go.uber.org/atomic"
packages = ["."]
pruneopts = ""
revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289"
version = "v1.3.2"
[[projects]]
digest = "1:22c7effcb4da0eacb2bb1940ee173fac010e9ef3c691f5de4b524d538bd980f5"
name = "go.uber.org/multierr"
packages = ["."]
pruneopts = ""
revision = "3c4937480c32f4c13a875a1829af76c98ca3d40a"
version = "v1.1.0"
[[projects]]
digest = "1:246f378f80fba6fcf0f191c486b6613265abd2bc0f2fa55a36b928c67352021e"
name = "go.uber.org/zap"
packages = [
".",
"buffer",
"internal/bufferpool",
"internal/color",
"internal/exit",
"zapcore",
]
pruneopts = ""
revision = "ff33455a0e382e8a81d14dd7c922020b6b5e7982"
version = "v1.9.1"
[[projects]]
branch = "master"
digest = "1:efb97ebbd73c3a7068579327f5d98a17c09f6d8caf1fa3212c506e8bb78126b5"
name = "golang.org/x/crypto"
packages = [
"bcrypt",
"blowfish",
]
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"
packages = ["."]
pruneopts = ""
revision = "a96e63847dc3c67d17befa69c303767e2f84e54f"
version = "v2.1"
[[projects]]
digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
name = "gopkg.in/yaml.v2"
packages = ["."]
pruneopts = ""
revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
version = "v2.2.1"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
input-imports = ["github.com/mattermost/mattermost-server/model"]
solver-name = "gps-cdcl"
solver-version = 1

View File

@@ -1,3 +0,0 @@
[[constraint]]
name = "github.com/mattermost/mattermost-server"
version = "v5.16.0"

View File

@@ -1,3 +1,3 @@
package main
import _ "github.com/mattermost/mattermost-server/model"
func() main() {/* dummy file */}
func main() {/* dummy file */}

3
dependabot/go.mod Normal file
View File

@@ -0,0 +1,3 @@
module github.com/SmartHoneybee/ubiquitous-memory/dependabot
require github.com/mattermost/mattermost-server/v5 v5.29.0

View File

@@ -1,27 +0,0 @@
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
@@ -2072,9 +2072,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