mirror of
				https://github.com/SmartHoneybee/ubiquitous-memory
				synced 2025-10-25 15:53:48 +02:00 
			
		
		
		
	Compare commits
	
		
			17 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 3afd62ebaa | ||
|  | 4449fd0723 | ||
|  | 6f1748b909 | ||
|  | 5e14b05358 | ||
|  | c696751a66 | ||
|  | 9b16070789 | ||
|  | ab54cd5f53 | ||
|  | 0e12504498 | ||
|  | 4e3ab42325 | ||
|  | 44df1cad21 | ||
|  | 0f76d17e4b | ||
|  | b825885790 | ||
|  | 1aab309dbe | ||
|  | b0e13adaec | ||
|  | 6af28466ed | ||
|  | 423a1fc7a4 | ||
|  | f3a313d74b | 
							
								
								
									
										10
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								.travis.yml
									
									
									
									
									
								
							| @@ -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: | ||||
|   | ||||
| @@ -11,8 +11,8 @@ diff --git a/build/release.mk b/build/release.mk | ||||
| index 238343e..1b7859f 100644 | ||||
| --- a/build/release.mk | ||||
| +++ b/build/release.mk | ||||
| @@ -70,7 +70,7 @@ endif | ||||
|  	done | ||||
| @@ -77,7 +77,7 @@ endif | ||||
|   | ||||
|   | ||||
|  	@# ----- PLATFORM SPECIFIC ----- | ||||
| - | ||||
| @@ -20,14 +20,23 @@ 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 | ||||
| @@ -145,7 +145,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") | ||||
| @@ -155,7 +155,7 @@ else | ||||
|  	cp $(GOPATH)/bin/linux_amd64/mattermost $(DIST_PATH)/bin # from cross-compiled bin dir | ||||
|  	cp $(GOPATH)/bin/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir | ||||
|  endif | ||||
| -	MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://github.com/mattermost/mmctl/releases/download/$(MMCTL_REL_TO_DOWNLOAD)/$$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"; \ | ||||
| --  | ||||
| 2.11.0 | ||||
|   | ||||
							
								
								
									
										5
									
								
								build.sh
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								build.sh
									
									
									
									
									
								
							| @@ -89,10 +89,9 @@ 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" | ||||
| sed -i \ | ||||
| 	-e 's#go generate#env --unset=GOOS --unset=GOARCH &#' \ | ||||
| 	-e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \ | ||||
| 	-e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \ | ||||
| 	-e 's#PWD#CURDIR#' \ | ||||
| 	"${HOME}/go/src/github.com/mattermost/mattermost-server/Makefile" \ | ||||
| 	"${HOME}/go/src/github.com/mattermost/mattermost-server/build/release.mk" | ||||
|   | ||||
							
								
								
									
										197
									
								
								dependabot/Gopkg.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										197
									
								
								dependabot/Gopkg.lock
									
									
									
										generated
									
									
									
								
							| @@ -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:255e3d4847203dc43313d40727f336832a99170226c6136a7b943750b865528e" | ||||
|   name = "github.com/go-ldap/ldap" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "729c20c2694d870bcd631f0dadaecd088bd7ccbc" | ||||
|   version = "v3.0.2" | ||||
|  | ||||
| [[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:3101b3fac6092ae63a4dee90fba080d7e08f8546d0985b6cc9d277cdf23c3fe8" | ||||
|   name = "github.com/mattermost/mattermost-server" | ||||
|   packages = [ | ||||
|     "mlog", | ||||
|     "model", | ||||
|     "services/timezones", | ||||
|     "utils/jsonutils", | ||||
|     "utils/markdown", | ||||
|   ] | ||||
|   pruneopts = "" | ||||
|   revision = "817ee89711bf26d33f840ce7f59fba14da1ed168" | ||||
|   version = "v5.14.1" | ||||
|  | ||||
| [[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 | ||||
| @@ -1,3 +0,0 @@ | ||||
| [[constraint]] | ||||
|   name = "github.com/mattermost/mattermost-server" | ||||
|   version = "v5.14.1" | ||||
| @@ -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
									
								
							
							
						
						
									
										3
									
								
								dependabot/go.mod
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| module github.com/SmartHoneybee/ubiquitous-memory/dependabot | ||||
|  | ||||
| require github.com/mattermost/mattermost-server/v5 v5.21.0 | ||||
| @@ -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 | ||||
		Reference in New Issue
	
	Block a user