svn commit: r518545 - in branches/2019Q4: . databases databases/p5-AnyEvent-Redis databases/p5-Redis-Fast databases/py-redis databases/py-redis2 databases/redis databases/redis-devel databases/redi...

Matthias Fechner mfechner at FreeBSD.org
Wed Nov 27 20:52:22 UTC 2019 

Author: mfechner
Date: Wed Nov 27 20:52:15 2019
New Revision: 518545
URL: https://svnweb.freebsd.org/changeset/ports/518545

Log:
  MFH: r517122 r518107 r518144 r518204 r518523
  
  www/gitlab-ce: bugfix release to 12.4.2.
  Changelog:
  https://about.gitlab.com/blog/2019/11/04/gitlab-12-4-2-released/
  
  Repocopy the databases/redis to the databases/redis4 to update
  the databases/redis port to the latest stable version, 5.0.6.
  
  PR:		241526
  Reviewed by:	portmgr (adamw)
  Approved by:	portmgr (adamw)
  Differential Revision:	https://reviews.freebsd.org/D22336
  
  www/gitlab-ce: Bugfix update to 12.4.3.
  Changelog:
  https://about.gitlab.com/blog/2019/11/18/gitlab-12-4-3-released/
  
  Update to 12.5.0.
  Changelog:
  https://about.gitlab.com/blog/2019/11/22/gitlab-12-5-released/
  
  Security update to 12.5.1.
  Changelog:
  https://about.gitlab.com/blog/2019/11/27/security-release-gitlab-12-5-1-released/
  
  Security:	1aa7a094-1147-11ea-b537-001b217b3468
  
  Approved by:	ports-secteam (joneum)

Added:
  branches/2019Q4/databases/redis4/
     - copied from r518107, head/databases/redis4/
Deleted:
  branches/2019Q4/databases/redis/files/patch-src-config.h
  branches/2019Q4/databases/redis/files/patch-src-lua_cjson.c
Modified:
  branches/2019Q4/UPDATING
  branches/2019Q4/databases/Makefile
  branches/2019Q4/databases/p5-AnyEvent-Redis/Makefile
  branches/2019Q4/databases/p5-Redis-Fast/Makefile
  branches/2019Q4/databases/py-redis/Makefile
  branches/2019Q4/databases/py-redis2/Makefile
  branches/2019Q4/databases/redis-devel/Makefile
  branches/2019Q4/databases/redis/Makefile
  branches/2019Q4/databases/redis/distinfo
  branches/2019Q4/databases/redis/files/extra-patch-src-Makefile.lua
  branches/2019Q4/databases/redis/files/extra-patch-src-Makefile.luajit
  branches/2019Q4/databases/redis/files/patch-deps-Makefile
  branches/2019Q4/databases/redis/files/patch-deps-hiredis-Makefile
  branches/2019Q4/databases/redis/files/patch-deps-hiredis-net.c
  branches/2019Q4/databases/redis/files/patch-deps-linenoise-Makefile
  branches/2019Q4/databases/redis/files/patch-redis.conf
  branches/2019Q4/databases/redis/files/patch-src-Makefile
  branches/2019Q4/databases/redis/files/patch-src-mkreleasehdr.sh
  branches/2019Q4/databases/rubygem-hiredis/Makefile
  branches/2019Q4/devel/gitblit/Makefile
  branches/2019Q4/devel/py-dj22-django-rq/Makefile
  branches/2019Q4/irc/anope/Makefile
  branches/2019Q4/net-im/rubygem-lita/Makefile
  branches/2019Q4/net/opensips/Makefile
  branches/2019Q4/security/openvas8-scanner/Makefile
  branches/2019Q4/www/gitlab-ce/Makefile
  branches/2019Q4/www/gitlab-ce/distinfo
  branches/2019Q4/www/gitlab-ce/files/patch-Gemfile
  branches/2019Q4/www/gitlab-ce/pkg-message
  branches/2019Q4/www/gitlab-ce/pkg-plist
Directory Properties:
  branches/2019Q4/   (props changed)

Modified: branches/2019Q4/UPDATING
==============================================================================
--- branches/2019Q4/UPDATING	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/UPDATING	Wed Nov 27 20:52:15 2019	(r518545)
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20191108:
+  AFFECTS: users of databases/redis[-devel]
+  AUTHOR: osa at FreeBSD.org
+
+  The databases/redis port has been updated to the recent stable release.
+  Users wanting to stay on v4.x can replace databases/redis with 
+  databases/redis4 with one of the following commands:
+
+  # pkg install databases/redis4
+    or
+  # portmaster -o databases/redis4 databases/redis
+    or
+  # portupgrade -o databases/redis4 databases/redis
+
 20190930:
   AFFECTS: users of net-mgmt/netbox
   AUTHOR: kai at FreeBSD.org

Modified: branches/2019Q4/databases/Makefile
==============================================================================
--- branches/2019Q4/databases/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -889,6 +889,7 @@
     SUBDIR += recutils
     SUBDIR += redis
     SUBDIR += redis-devel
+    SUBDIR += redis4
     SUBDIR += redis_exporter
     SUBDIR += redisdesktopmanager
     SUBDIR += retcl

Modified: branches/2019Q4/databases/p5-AnyEvent-Redis/Makefile
==============================================================================
--- branches/2019Q4/databases/p5-AnyEvent-Redis/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/p5-AnyEvent-Redis/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,7 +3,7 @@
 
 PORTNAME=	AnyEvent-Redis
 PORTVERSION=	0.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DGL

Modified: branches/2019Q4/databases/p5-Redis-Fast/Makefile
==============================================================================
--- branches/2019Q4/databases/p5-Redis-Fast/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/p5-Redis-Fast/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -2,6 +2,7 @@
 
 PORTNAME=	Redis-Fast
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-

Modified: branches/2019Q4/databases/py-redis/Makefile
==============================================================================
--- branches/2019Q4/databases/py-redis/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/py-redis/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,6 +3,7 @@
 
 PORTNAME=	redis
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Modified: branches/2019Q4/databases/py-redis2/Makefile
==============================================================================
--- branches/2019Q4/databases/py-redis2/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/py-redis2/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,6 +3,7 @@
 
 PORTNAME=	redis
 PORTVERSION=	2.10.6
+PORTREVISION=	1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2

Modified: branches/2019Q4/databases/redis-devel/Makefile
==============================================================================
--- branches/2019Q4/databases/redis-devel/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis-devel/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -4,6 +4,7 @@
 PORTNAME=	redis
 DISTVERSION=	5.0.5
 PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 PKGNAMESUFFIX=	-devel
@@ -65,7 +66,7 @@ USES+=		tcl:build
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis-4.*
+CONFLICTS?=	redis4-4.* redis-5.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \

Modified: branches/2019Q4/databases/redis/Makefile
==============================================================================
--- branches/2019Q4/databases/redis/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	4.0.14
-PORTREVISION=	1
+PORTVERSION=	5.0.6
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 
@@ -12,15 +11,19 @@ COMMENT=	Persistent key-value database with built-in n
 
 LICENSE=	BSD3CLAUSE
 
-OPTIONS_DEFINE=	TESTS TRIB
+OPTIONS_DEFINE=	JEMALLOC TESTS TRIB
 OPTIONS_RADIO=	EXTLUA
 OPTIONS_RADIO_EXTLUA=	LUA LUAJIT
 OPTIONS_SUB=	yes
+JEMALLOC_DESC=	Use jemalloc
 LUA_DESC=	Use lang/lua instead of builtin lua
 LUAJIT_DESC=	Use lang/luajit instead of builtin lua
 TESTS_DESC=	Install lang/tcl for redis unit tests
 TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
 
+USES+=		compiler gmake
+MAKE_ENV=	"V=yo"
+
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
@@ -29,6 +32,10 @@ USE_GCC=	yes
 CFLAGS+=	-march=i586
 .endif
 
+.if ${PORT_OPTIONS:MJEMALLOC}
+MAKE_ENV+=	"USE_JEMALLOC=yes"
+.endif
+
 .if ${PORT_OPTIONS:MTRIB}
 CATEGORIES+=	ruby
 USE_RUBY=	yes
@@ -56,10 +63,8 @@ USES+=		tcl:build
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis-devel-5.*
+CONFLICTS?=	redis4-4.* redis-devel-5.*
 
-USES+=		gmake
-MAKE_ENV=	"V=yo"
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
 		redis-cli redis-sentinel redis-server
@@ -84,10 +89,18 @@ PLIST_SUB+=	REDIS_USER=${USERS} \
 	REDIS_DBDIR=${REDIS_DBDIR} \
 	REDIS_RUNDIR=${REDIS_RUNDIR}
 
-.if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA}
+.include <bsd.port.pre.mk>
+
 post-patch:
+.if ${PORT_OPTIONS:MJEMALLOC}
+	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
+.endif
+.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT}
 	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
 .endif
+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
+	${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/lzf_d.c
+.endif
 
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -107,4 +120,4 @@ do-install:
 do-test:
 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: branches/2019Q4/databases/redis/distinfo
==============================================================================
--- branches/2019Q4/databases/redis/distinfo	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/distinfo	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553045896
-SHA256 (redis-4.0.14.tar.gz) = 1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7
-SIZE (redis-4.0.14.tar.gz) = 1740967
+TIMESTAMP = 1572268200
+SHA256 (redis-5.0.6.tar.gz) = 6624841267e142c5d5d5be292d705f8fb6070677687c5aad1645421a936d22b3
+SIZE (redis-5.0.6.tar.gz) = 1979873

Modified: branches/2019Q4/databases/redis/files/extra-patch-src-Makefile.lua
==============================================================================
--- branches/2019Q4/databases/redis/files/extra-patch-src-Makefile.lua	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/extra-patch-src-Makefile.lua	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2017-08-06 10:42:53.992510000 -0400
-+++ src/Makefile	2017-08-06 10:44:57.344366000 -0400
+--- src/Makefile.orig	2018-10-18 18:09:43.930566000 -0400
++++ src/Makefile	2018-10-18 18:10:32.562125000 -0400
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -30,7 +30,7 @@
  ifeq ($(MALLOC),tcmalloc)
  	FINAL_CFLAGS+= -DUSE_TCMALLOC
 @@ -130,6 +130,9 @@
- 	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
+ 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
  endif
  
 +FINAL_CFLAGS+=-I${PREFIX}/include/lua51
@@ -42,10 +42,10 @@
 @@ -150,6 +153,7 @@
  REDIS_SERVER_NAME=redis-server
  REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
  REDIS_BENCHMARK_NAME=redis-benchmark
 @@ -201,7 +205,7 @@
  

Modified: branches/2019Q4/databases/redis/files/extra-patch-src-Makefile.luajit
==============================================================================
--- branches/2019Q4/databases/redis/files/extra-patch-src-Makefile.luajit	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/extra-patch-src-Makefile.luajit	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2017-08-06 10:48:29.559222000 -0400
-+++ src/Makefile	2017-08-06 10:50:45.155432000 -0400
+--- src/Makefile.orig	2018-10-18 18:11:24.649811000 -0400
++++ src/Makefile	2018-10-18 18:11:35.160523000 -0400
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -30,7 +30,7 @@
  ifeq ($(MALLOC),tcmalloc)
  	FINAL_CFLAGS+= -DUSE_TCMALLOC
 @@ -130,6 +130,9 @@
- 	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
+ 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
  endif
  
 +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
@@ -42,10 +42,10 @@
 @@ -150,6 +153,7 @@
  REDIS_SERVER_NAME=redis-server
  REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
  REDIS_BENCHMARK_NAME=redis-benchmark
 @@ -201,7 +205,7 @@
  

Modified: branches/2019Q4/databases/redis/files/patch-deps-Makefile
==============================================================================
--- branches/2019Q4/databases/redis/files/patch-deps-Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/patch-deps-Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,6 +1,6 @@
---- deps/Makefile.orig	2016-02-02 19:38:43.438304000 -0500
-+++ deps/Makefile	2016-02-02 19:40:05.911356000 -0500
-@@ -59,7 +59,7 @@
+--- deps/Makefile.orig	2019-09-25 10:40:18 UTC
++++ deps/Makefile
+@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
  	LUA_CFLAGS= -D__C99FEATURES__=1
  endif
  
@@ -9,7 +9,7 @@
  LUA_LDFLAGS+= $(LDFLAGS)
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -69,7 +69,7 @@
+@@ -68,7 +68,7 @@ ARFLAGS=rcu
  
  lua: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)

Modified: branches/2019Q4/databases/redis/files/patch-deps-hiredis-Makefile
==============================================================================
--- branches/2019Q4/databases/redis/files/patch-deps-hiredis-Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/patch-deps-hiredis-Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig	2017-05-01 19:46:31.733229000 -0400
-+++ deps/hiredis/Makefile	2017-05-01 19:48:37.150358000 -0400
-@@ -15,7 +15,7 @@
+--- deps/hiredis/Makefile.orig	2019-09-25 10:40:18 UTC
++++ deps/hiredis/Makefile
+@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
  HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
  
  # Installation related variables and target
@@ -9,7 +9,7 @@
  INCLUDE_PATH?=include/hiredis
  LIBRARY_PATH?=lib
  PKGCONF_PATH?=pkgconfig
-@@ -38,10 +38,10 @@
+@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
  CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
@@ -23,10 +23,11 @@
  REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
  
  DYLIBSUFFIX=so
-@@ -60,6 +60,15 @@
+@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
+   REAL_LDFLAGS+= -ldl -lnsl -lsocket
    DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
    INSTALL= cp -r
- endif
++endif
 +ifeq ($(uname_S),FreeBSD)
 +  CFLAGS?=$(CFLAGS)
 +  CCLINK?=-pthread
@@ -35,7 +36,6 @@
 +  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
 +  STLIBNAME?=libhiredis.a
 +  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
-+endif
+ endif
  ifeq ($(uname_S),Darwin)
    DYLIBSUFFIX=dylib
-   DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)

Modified: branches/2019Q4/databases/redis/files/patch-deps-hiredis-net.c
==============================================================================
--- branches/2019Q4/databases/redis/files/patch-deps-hiredis-net.c	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/patch-deps-hiredis-net.c	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,6 +1,6 @@
---- deps/hiredis/net.c.orig	2017-04-22 07:23:27.000000000 -0400
-+++ deps/hiredis/net.c	2017-05-05 20:02:09.292479000 -0400
-@@ -135,13 +135,12 @@
+--- deps/hiredis/net.c.orig	2019-09-25 10:40:18 UTC
++++ deps/hiredis/net.c
+@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
  
      val = interval;
  
@@ -16,7 +16,7 @@
      val = interval;
      if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-@@ -160,6 +159,27 @@
+@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
          return REDIS_ERR;
      }
@@ -44,7 +44,7 @@
  #endif
  #endif
  
-@@ -431,7 +451,7 @@
+@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
      struct sockaddr_un sa;
      long timeout_msec = -1;
  
@@ -53,7 +53,7 @@
          return REDIS_ERR;
      if (redisSetBlocking(c,0) != REDIS_OK)
          return REDIS_ERR;
-@@ -456,7 +476,7 @@
+@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
      if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
          return REDIS_ERR;
  

Modified: branches/2019Q4/databases/redis/files/patch-deps-linenoise-Makefile
==============================================================================
--- branches/2019Q4/databases/redis/files/patch-deps-linenoise-Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/patch-deps-linenoise-Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,5 +1,5 @@
---- deps/linenoise/Makefile.orig	2015-01-17 22:13:25.000000000 +0300
-+++ deps/linenoise/Makefile	2015-01-17 22:13:45.000000000 +0300
+--- deps/linenoise/Makefile.orig	2019-09-25 10:40:18 UTC
++++ deps/linenoise/Makefile
 @@ -1,10 +1,10 @@
  STD=
  WARN= -Wall

Modified: branches/2019Q4/databases/redis/files/patch-redis.conf
==============================================================================
--- branches/2019Q4/databases/redis/files/patch-redis.conf	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/patch-redis.conf	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,6 +1,6 @@
---- redis.conf.orig	2016-06-17 09:15:21.000000000 -0400
-+++ redis.conf	2016-06-18 11:58:19.871082000 -0400
-@@ -125,7 +125,7 @@
+--- redis.conf.orig	2019-09-25 10:40:18 UTC
++++ redis.conf
+@@ -133,7 +133,7 @@ tcp-keepalive 300
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
  # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
@@ -9,7 +9,7 @@
  
  # If you run Redis from upstart or systemd, Redis can interact with your
  # supervision tree. Options:
-@@ -147,7 +147,7 @@
+@@ -155,7 +155,7 @@ supervised no
  #
  # Creating a pid file is best effort: if Redis is not able to create it
  # nothing bad happens, the server will start and run normally.
@@ -18,7 +18,7 @@
  
  # Specify the server verbosity level.
  # This can be one of:
-@@ -160,7 +160,7 @@
+@@ -168,7 +168,7 @@ loglevel notice
  # Specify the log file name. Also the empty string can be used to force
  # Redis to log on the standard output. Note that if you use standard
  # output for logging but daemonize, logs will be sent to /dev/null
@@ -27,7 +27,7 @@
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -244,7 +244,7 @@
+@@ -260,7 +260,7 @@ dbfilename dump.rdb
  # The Append Only File will also be created inside this directory.
  #
  # Note that you must specify a directory here, not a file name.

Modified: branches/2019Q4/databases/redis/files/patch-src-Makefile
==============================================================================
--- branches/2019Q4/databases/redis/files/patch-src-Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/patch-src-Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,7 +1,7 @@
---- src/Makefile.orig	2015-04-01 17:01:44.000000000 +0300
-+++ src/Makefile	2015-04-07 21:30:22.464962000 +0300
-@@ -22,7 +22,7 @@
- WARN=-Wall -W
+--- src/Makefile.orig	2019-09-25 10:40:18 UTC
++++ src/Makefile
+@@ -29,7 +29,7 @@ endif
+ WARN=-Wall -W -Wno-missing-field-initializers
  OPT=$(OPTIMIZATION)
  
 -PREFIX?=/usr/local
@@ -9,7 +9,7 @@
  INSTALL_BIN=$(PREFIX)/bin
  INSTALL=install
  
-@@ -52,7 +52,6 @@
+@@ -75,7 +75,6 @@ endif
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
@@ -17,9 +17,9 @@
  
  ifeq ($(uname_S),SunOS)
  	# SunOS
-@@ -63,6 +62,11 @@
- ifeq ($(uname_S),Darwin)
- 	# Darwin (nothing to do)
+@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
+ 	# Darwin
+ 	FINAL_LIBS+= -ldl
  else
 +ifeq ($(uname_S),FreeBSD)
 +        # FreeBSD
@@ -29,11 +29,11 @@
  ifeq ($(uname_S),AIX)
          # AIX
          FINAL_LDFLAGS+= -Wl,-bexpall
-@@ -75,6 +79,7 @@
+@@ -120,6 +124,7 @@ else
+ 	# All the other OSes (notably Linux)
+ 	FINAL_LDFLAGS+= -rdynamic
+ 	FINAL_LIBS+=-ldl -pthread -lrt
++endif
  endif
  endif
  endif
-+endif
- # Include paths to dependencies
- FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
- 

Modified: branches/2019Q4/databases/redis/files/patch-src-mkreleasehdr.sh
==============================================================================
--- branches/2019Q4/databases/redis/files/patch-src-mkreleasehdr.sh	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/redis/files/patch-src-mkreleasehdr.sh	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,5 +1,5 @@
---- src/mkreleasehdr.sh.orig	2013-08-13 15:39:40.000000000 +0400
-+++ src/mkreleasehdr.sh	2013-08-13 15:39:55.000000000 +0400
+--- src/mkreleasehdr.sh.orig	2019-09-25 10:40:18 UTC
++++ src/mkreleasehdr.sh
 @@ -1,6 +1,6 @@
  #!/bin/sh
 -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
@@ -7,5 +7,5 @@
 +GIT_SHA1="00000000"
 +GIT_DIRTY="0"
  BUILD_ID=`uname -n`"-"`date +%s`
- test -f release.h || touch release.h
- (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
+ if [ -n "$SOURCE_DATE_EPOCH" ]; then
+   BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u %s)

Modified: branches/2019Q4/databases/rubygem-hiredis/Makefile
==============================================================================
--- branches/2019Q4/databases/rubygem-hiredis/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/databases/rubygem-hiredis/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hiredis
 PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 

Modified: branches/2019Q4/devel/gitblit/Makefile
==============================================================================
--- branches/2019Q4/devel/gitblit/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/devel/gitblit/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gitblit
 PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	http://dl.bintray.com/${PORTNAME}/releases/
 EXTRACT_SUFX=	.war

Modified: branches/2019Q4/devel/py-dj22-django-rq/Makefile
==============================================================================
--- branches/2019Q4/devel/py-dj22-django-rq/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/devel/py-dj22-django-rq/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-rq
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj22-
 MASTER_SITES=	CHEESESHOP
@@ -20,7 +21,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel
 		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
-		redis-server:databases/redis
+		redis-server:databases/redis4
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils

Modified: branches/2019Q4/irc/anope/Makefile
==============================================================================
--- branches/2019Q4/irc/anope/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/irc/anope/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -2,6 +2,7 @@
 
 PORTNAME=	anope
 PORTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	egypcio at FreeBSD.org
@@ -36,7 +37,7 @@ NLS_USES=	gettext
 
 OPENSSL_USES=	ssl
 
-REDIS_RUN_DEPENDS=	redis:databases/redis
+REDIS_RUN_DEPENDS=	redis>=0:databases/redis
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 

Modified: branches/2019Q4/net-im/rubygem-lita/Makefile
==============================================================================
--- branches/2019Q4/net-im/rubygem-lita/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/net-im/rubygem-lita/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lita
 PORTVERSION=	4.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im rubygems
 MASTER_SITES=	RG
 

Modified: branches/2019Q4/net/opensips/Makefile
==============================================================================
--- branches/2019Q4/net/opensips/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/net/opensips/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,7 +3,7 @@
 
 PORTNAME=		opensips
 DISTVERSION=		2.2.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=		net
 MASTER_SITES=		http://opensips.org/pub/opensips/${PORTVERSION}/
 
@@ -25,7 +25,7 @@ LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
 BUILD_DEPENDS=		ginstall:sysutils/coreutils \
 			gtar:archivers/gtar \
 			gm4:devel/m4 \
-			redis-server:databases/redis-devel
+			redis-server:databases/redis
 RUN_DEPENDS=		${LOCALBASE}/bin/bash:shells/bash \
 			${LOCALBASE}/bin/grep:textproc/gnugrep
 

Modified: branches/2019Q4/security/openvas8-scanner/Makefile
==============================================================================
--- branches/2019Q4/security/openvas8-scanner/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/security/openvas8-scanner/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	openvas8-scanner
 PORTVERSION?=	5.0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES?=	http://wald.intevation.org/frs/download.php/2436/
 DISTNAME=	${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}

Modified: branches/2019Q4/www/gitlab-ce/Makefile
==============================================================================
--- branches/2019Q4/www/gitlab-ce/Makefile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/www/gitlab-ce/Makefile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	12.4.1
+PORTVERSION=	12.5.1
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -16,17 +16,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # which makes maintaining this long list much easier!
 MY_DEPENDS=	git>=2.21.0:devel/git \
 	gitlab-shell>=10.2.0:devel/gitlab-shell \
-	gitlab-workhorse>=8.14.0:www/gitlab-workhorse \
-	gitaly>=1.67.0:devel/gitaly \
-	gitlab-pages>=1.11.0:www/gitlab-pages \
+	gitlab-workhorse>=8.14.1:www/gitlab-workhorse \
+	gitaly>=1.72.1:devel/gitaly \
+	gitlab-pages>=1.12.0:www/gitlab-pages \
 	redis>=3.2.12:databases/redis \
 	yarn>=1.10.0:www/yarn \
 	rubygem-rails52>=5.2.3:www/rubygem-rails52 \
 	rubygem-bootsnap>=1.4<2.0:devel/rubygem-bootsnap \
 	rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \
-	rubygem-responders2-rails52>=2.0<3.0:www/rubygem-responders2-rails52 \
+	rubygem-responders-rails52>=3.0<4.0:www/rubygem-responders-rails52 \
 	rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
-	rubygem-default_value_for32>=3.2.0<3.3.0:devel/rubygem-default_value_for32 \
+	rubygem-default_value_for>=3.3.0<3.4.0:devel/rubygem-default_value_for \
 	rubygem-pg>=1.1<2:databases/rubygem-pg \
 	rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \
 	rubygem-grape-path-helpers>=1.1<2.0:devel/rubygem-grape-path-helpers \
@@ -49,7 +49,7 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_crowd22>=2.2.0<2.3.0:devel/rubygem-omniauth_crowd22 \
 	rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \
-	rubygem-omniauth_openid_connect>=0.3.1<0.4.0:net/rubygem-omniauth_openid_connect \
+	rubygem-omniauth_openid_connect>=0.3.3<0.4.0:net/rubygem-omniauth_openid_connect \
 	rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \
 	rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \
 	rubygem-rack-oauth2>=1.9.3<1.10.0:security/rubygem-rack-oauth2 \
@@ -63,10 +63,10 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \
 	rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \
 	rubygem-validates_hostname>=1.0.6<1.1.0:dns/rubygem-validates_hostname \
-	rubygem-rubyzip12>=1.2.2<1.3.0:archivers/rubygem-rubyzip12 \
+	rubygem-rubyzip>=1.3.0<1.4.0:archivers/rubygem-rubyzip \
 	rubygem-acme-client>=2.0.2<2.1.0:security/rubygem-acme-client \
 	rubygem-browser>=2.5<3.0:www/rubygem-browser \
-	rubygem-gpgme>=2.0.18<2.1.0:security/rubygem-gpgme \
+	rubygem-gpgme>=2.0.19<2.1.0:security/rubygem-gpgme \
 	rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \
 	rubygem-net-ldap>0:net/rubygem-net-ldap \
 	rubygem-grape11>=1.1.0<1.2.0:devel/rubygem-grape11 \
@@ -97,7 +97,7 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-aws-sdk>0:devel/rubygem-aws-sdk \
 	rubygem-faraday_middleware-aws-signers-v4>0:devel/rubygem-faraday_middleware-aws-signers-v4 \
 	rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \
-	rubygem-deckar01-task_list>=2.2.0<2.3.0:www/rubygem-deckar01-task_list \
+	rubygem-deckar01-task_list>=2.2.1<2.3.0:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
 	rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \
 	rubygem-commonmarker>=0.17<1.0:textproc/rubygem-commonmarker \
@@ -112,17 +112,18 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-rouge>=3.11.0<3.13:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
 	rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \
-	rubygem-nokogiri>=1.10.4<1.11.0:textproc/rubygem-nokogiri \
+	rubygem-nokogiri>=1.10.5<1.11.0:textproc/rubygem-nokogiri \
 	rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy31>=3.1.0<3.2.0:textproc/rubygem-diffy31 \
+	rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \
 	rubygem-rack>=2.0.7<2.1.0,3:www/rubygem-rack \
 	rubygem-unicorn>=5.4.1<5.5.0:www/rubygem-unicorn \
 	rubygem-unicorn-worker-killer>=0.4.4<0.5.0:www/rubygem-unicorn-worker-killer \
 	rubygem-puma>=3.12<4.0:www/rubygem-puma \
 	rubygem-puma_worker_killer>=0:www/rubygem-puma_worker_killer \
 	rubygem-rack-timeout>=0:www/rubygem-rack-timeout \
-	rubygem-state_machines-activerecord05>=0.5.1<6.0.0:databases/rubygem-state_machines-activerecord05 \
+	rubygem-state_machines-activerecord>=0.6.0<0.7.0:databases/rubygem-state_machines-activerecord \
 	rubygem-acts-as-taggable-on>=6.0<7.0:www/rubygem-acts-as-taggable-on \
 	rubygem-sidekiq>=5.2.7<5.3.0:devel/rubygem-sidekiq \
 	rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
@@ -154,7 +155,6 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \
 	rubygem-loofah>=2.2<3.0:textproc/rubygem-loofah \
 	rubygem-licensee8>=8.9<9.0:devel/rubygem-licensee8 \
-	rubygem-rack-attack44>=4.4.1<4.5.0:www/rubygem-rack-attack44 \
 	rubygem-ace-rails-ap>=4.1.0<4.2.0:www/rubygem-ace-rails-ap \
 	rubygem-charlock_holmes>=0.7.5<0.8.0:textproc/rubygem-charlock_holmes \
 	rubygem-mimemagic>=0.3.2<0.4.0:misc/rubygem-mimemagic \
@@ -172,8 +172,9 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-request_store>=1.3<2.0:devel/rubygem-request_store \
 	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
 	rubygem-gitlab-license>=1.0<2.0:devel/rubygem-gitlab-license \
+	rubygem-rack-attack>=6.2.0<6.3.0:www/rubygem-rack-attack \
 	rubygem-sentry-raven>=2.9<3.0:devel/rubygem-sentry-raven \
-	rubygem-premailer-rails19-rails52>=1.9.7<1.10.0:mail/rubygem-premailer-rails19-rails52 \
+	rubygem-premailer-rails-rails52>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails52 \
 	rubygem-gitlab-labkit>=0.5<1.0:devel/rubygem-gitlab-labkit \
 	rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \
 	rubygem-rails-i18n-rails52>=5.1<6.0:devel/rubygem-rails-i18n-rails52 \
@@ -206,18 +207,19 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \
 	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
 	rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
-	rubygem-gitaly>=1.65.0<1.66:net/rubygem-gitaly \
-	rubygem-grpc>=1.19.0<1.20.0:net/rubygem-grpc \
-	rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371 \
+	rubygem-gitaly>=1.70.0<1.71:net/rubygem-gitaly \
+	rubygem-grpc>=1.24.0<1.25.0:net/rubygem-grpc \
+	rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38 \
 	rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
-	rubygem-flipper013>=0.13.0<0.14.0:devel/rubygem-flipper013 \
-	rubygem-flipper-active_record013>=0.13.0<0.14.0:databases/rubygem-flipper-active_record013 \
-	rubygem-flipper-active_support_cache_store013>=0.13.0<0.14.0:devel/rubygem-flipper-active_support_cache_store013 \
+	rubygem-flipper>=0.17.1<0.18.0:devel/rubygem-flipper \
+	rubygem-flipper-active_record>=0.17.1<0.18.0:databases/rubygem-flipper-active_record \
+	rubygem-flipper-active_support_cache_store>=0.17.1<0.18.0:devel/rubygem-flipper-active_support_cache_store \
 	rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
 	rubygem-lograge-rails52>=0.5<1.0:www/rubygem-lograge-rails52 \
 	rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \
 	rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \
-	rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries
+	rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries \
+	rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
@@ -237,7 +239,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	4281915cfebcaf03e729ddf8cfe58d9cb76b2356
+GL_COMMIT=	79a183ea8dee98900cfb495611c3342f6f312df0
 
 USERS=	git
 GROUPS=	git

Modified: branches/2019Q4/www/gitlab-ce/distinfo
==============================================================================
--- branches/2019Q4/www/gitlab-ce/distinfo	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/www/gitlab-ce/distinfo	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572460607
-SHA256 (gitlab-org-gitlab-foss-4281915cfebcaf03e729ddf8cfe58d9cb76b2356_GL0.tar.gz) = 6acedf5cf84f518a30339ca1b8d05167bf9e986cdc3857e53476f594bca7ec12
-SIZE (gitlab-org-gitlab-foss-4281915cfebcaf03e729ddf8cfe58d9cb76b2356_GL0.tar.gz) = 100115726
+TIMESTAMP = 1574880585
+SHA256 (gitlab-org-gitlab-foss-79a183ea8dee98900cfb495611c3342f6f312df0_GL0.tar.gz) = bdb2900e65c949239b035031d6a2ab41f13161fc026dfa04e7e758763e84e969
+SIZE (gitlab-org-gitlab-foss-79a183ea8dee98900cfb495611c3342f6f312df0_GL0.tar.gz) = 102102959

Modified: branches/2019Q4/www/gitlab-ce/files/patch-Gemfile
==============================================================================
--- branches/2019Q4/www/gitlab-ce/files/patch-Gemfile	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/www/gitlab-ce/files/patch-Gemfile	Wed Nov 27 20:52:15 2019	(r518545)
@@ -1,4 +1,4 @@
---- Gemfile.orig	2019-10-22 12:01:49 UTC
+--- Gemfile.orig	2019-11-22 03:17:46 UTC
 +++ Gemfile
 @@ -92,7 +92,6 @@ gem 'graphql', '~> 1.9.11'
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
@@ -16,8 +16,8 @@
 +gem 'rouge', '~> 3.11'
  gem 'truncato', '~> 0.7.11'
  gem 'bootstrap_form', '~> 4.2.0'
- gem 'nokogiri', '~> 1.10.4'
-@@ -225,7 +224,7 @@ gem 'redis-rails', '~> 5.0.2'
+ gem 'nokogiri', '~> 1.10.5'
+@@ -226,7 +225,7 @@ gem 'redis-rails', '~> 5.0.2'
  gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
  
  # HipChat integration
@@ -26,14 +26,13 @@
  
  # Jira integration
  gem 'jira-ruby', '~> 1.7'
-@@ -328,85 +327,6 @@ group :metrics do
+@@ -329,89 +328,6 @@ group :metrics do
    # Prometheus
    gem 'prometheus-client-mmap', '~> 0.9.10'
    gem 'raindrops', '~> 0.18'
 -end
 -
 -group :development do
--  gem 'foreman', '~> 0.84.0'
 -  gem 'brakeman', '~> 4.2', require: false
 -  gem 'danger', '~> 6.0', require: false
 -
@@ -90,7 +89,6 @@
 -
 -  gem 'benchmark-ips', '~> 2.3.0', require: false
 -
--  gem 'license_finder', '~> 5.4', require: false
 -  gem 'knapsack', '~> 1.17'
 -
 -  gem 'stackprof', '~> 0.2.10', require: false
@@ -100,6 +98,11 @@
 -  gem 'timecop', '~> 0.8.0'
 -end
 -
+-# Gems required in omnibus-gitlab pipeline
+-group :development, :test, :omnibus do
+-  gem 'license_finder', '~> 5.4', require: false
+-end
+-
 -group :test do
 -  gem 'shoulda-matchers', '~> 4.0.1', require: false
 -  gem 'email_spec', '~> 2.2.0'
@@ -109,6 +112,7 @@
 -  gem 'concurrent-ruby', '~> 1.1'
 -  gem 'test-prof', '~> 0.10.0'
 -  gem 'rspec_junit_formatter'
+-  gem 'guard-rspec'
  end
  
  gem 'octokit', '~> 4.9'

Modified: branches/2019Q4/www/gitlab-ce/pkg-message
==============================================================================
--- branches/2019Q4/www/gitlab-ce/pkg-message	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/www/gitlab-ce/pkg-message	Wed Nov 27 20:52:15 2019	(r518545)
@@ -6,7 +6,7 @@ Gitlab was installed successfully.
 You now need to set up the various components of Gitlab, so please
 follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.5-freebsd.md
 EOM
   type: install
 }
@@ -20,7 +20,7 @@ EOM
 If you just installed an major upgrade of GitLab, for example you
 switched from 11.8.x to 11.9.x, please follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.3-12.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.4-12.5-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:

Modified: branches/2019Q4/www/gitlab-ce/pkg-plist
==============================================================================
--- branches/2019Q4/www/gitlab-ce/pkg-plist	Wed Nov 27 20:40:56 2019	(r518544)
+++ branches/2019Q4/www/gitlab-ce/pkg-plist	Wed Nov 27 20:52:15 2019	(r518545)
@@ -14,10 +14,10 @@
 %%WWWDIR%%/.gitlab/ci/frontend.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/ci/global.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/ci/memory.gitlab-ci.yml
-%%WWWDIR%%/.gitlab/ci/notifications.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/ci/pages.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/ci/qa.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/ci/rails.gitlab-ci.yml
+%%WWWDIR%%/.gitlab/ci/releases.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/ci/reports.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/ci/review.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/ci/setup.gitlab-ci.yml
@@ -68,6 +68,7 @@
 %%WWWDIR%%/GITLAB_SHELL_VERSION
 %%WWWDIR%%/GITLAB_WORKHORSE_VERSION
 %%WWWDIR%%/Gemfile
+%%WWWDIR%%/Guardfile
 %%WWWDIR%%/INSTALLATION_TYPE
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/MAINTENANCE.md
@@ -117,6 +118,8 @@
 %%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_success.png
 %%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_warning.png
 %%WWWDIR%%/app/assets/images/cluster_app_logos/cert_manager.png
+%%WWWDIR%%/app/assets/images/cluster_app_logos/crossplane.png
+%%WWWDIR%%/app/assets/images/cluster_app_logos/elastic_stack.png
 %%WWWDIR%%/app/assets/images/cluster_app_logos/elasticsearch.png
 %%WWWDIR%%/app/assets/images/cluster_app_logos/gitlab.png
 %%WWWDIR%%/app/assets/images/cluster_app_logos/helm.png
@@ -2138,12 +2141,14 @@
 %%WWWDIR%%/app/assets/javascripts/boards/stores/actions.js
 %%WWWDIR%%/app/assets/javascripts/boards/stores/boards_store.js
 %%WWWDIR%%/app/assets/javascripts/boards/stores/boards_store_ee.js
+%%WWWDIR%%/app/assets/javascripts/boards/stores/getters.js
 %%WWWDIR%%/app/assets/javascripts/boards/stores/index.js
 %%WWWDIR%%/app/assets/javascripts/boards/stores/modal_store.js
 %%WWWDIR%%/app/assets/javascripts/boards/stores/mutation_types.js
 %%WWWDIR%%/app/assets/javascripts/boards/stores/mutations.js
 %%WWWDIR%%/app/assets/javascripts/boards/stores/state.js
 %%WWWDIR%%/app/assets/javascripts/boards/toggle_focus.js
+%%WWWDIR%%/app/assets/javascripts/boards/toggle_labels.js
 %%WWWDIR%%/app/assets/javascripts/branches/branches_delete_modal.js
 %%WWWDIR%%/app/assets/javascripts/branches/components/divergence_graph.vue
 %%WWWDIR%%/app/assets/javascripts/branches/components/graph_bar.vue
@@ -2159,6 +2164,7 @@
 %%WWWDIR%%/app/assets/javascripts/clusters/clusters_bundle.js
 %%WWWDIR%%/app/assets/javascripts/clusters/components/application_row.vue
 %%WWWDIR%%/app/assets/javascripts/clusters/components/applications.vue
+%%WWWDIR%%/app/assets/javascripts/clusters/components/crossplane_provider_stack.vue
 %%WWWDIR%%/app/assets/javascripts/clusters/components/knative_domain_editor.vue
 %%WWWDIR%%/app/assets/javascripts/clusters/components/uninstall_application_button.vue
 %%WWWDIR%%/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
@@ -2193,10 +2199,19 @@
 %%WWWDIR%%/app/assets/javascripts/confidential_merge_request/state.js
 %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js
 %%WWWDIR%%/app/assets/javascripts/contextual_sidebar.js
+%%WWWDIR%%/app/assets/javascripts/contributors/components/contributors.vue
+%%WWWDIR%%/app/assets/javascripts/contributors/index.js
+%%WWWDIR%%/app/assets/javascripts/contributors/services/contributors_service.js
+%%WWWDIR%%/app/assets/javascripts/contributors/stores/actions.js
+%%WWWDIR%%/app/assets/javascripts/contributors/stores/getters.js
+%%WWWDIR%%/app/assets/javascripts/contributors/stores/index.js
+%%WWWDIR%%/app/assets/javascripts/contributors/stores/mutation_types.js
+%%WWWDIR%%/app/assets/javascripts/contributors/stores/mutations.js
+%%WWWDIR%%/app/assets/javascripts/contributors/stores/state.js
+%%WWWDIR%%/app/assets/javascripts/contributors/utils.js
 %%WWWDIR%%/app/assets/javascripts/create_cluster/eks_cluster/components/cluster_form_dropdown.vue
 %%WWWDIR%%/app/assets/javascripts/create_cluster/eks_cluster/components/create_eks_cluster.vue
 %%WWWDIR%%/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
-%%WWWDIR%%/app/assets/javascripts/create_cluster/eks_cluster/components/region_dropdown.vue
 %%WWWDIR%%/app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue
 %%WWWDIR%%/app/assets/javascripts/create_cluster/eks_cluster/constants.js
 %%WWWDIR%%/app/assets/javascripts/create_cluster/eks_cluster/index.js
@@ -2225,12 +2240,13 @@
 %%WWWDIR%%/app/assets/javascripts/create_cluster/gke_cluster/store/mutation_types.js
 %%WWWDIR%%/app/assets/javascripts/create_cluster/gke_cluster/store/mutations.js
 %%WWWDIR%%/app/assets/javascripts/create_cluster/gke_cluster/store/state.js
+%%WWWDIR%%/app/assets/javascripts/create_cluster/gke_cluster_namespace/index.js
+%%WWWDIR%%/app/assets/javascripts/create_cluster/init_create_cluster.js
 %%WWWDIR%%/app/assets/javascripts/create_item_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/create_label.js
 %%WWWDIR%%/app/assets/javascripts/create_merge_request_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/banner.vue
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_card_list_item.vue
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_component.vue
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_nav_item.vue
@@ -2361,13 +2377,24 @@
 %%WWWDIR%%/app/assets/javascripts/environments/services/environments_service.js
 %%WWWDIR%%/app/assets/javascripts/environments/stores/environments_store.js
 %%WWWDIR%%/app/assets/javascripts/environments/stores/helpers.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/components/error_details.vue
 %%WWWDIR%%/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
-%%WWWDIR%%/app/assets/javascripts/error_tracking/index.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/components/stacktrace.vue
+%%WWWDIR%%/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
+%%WWWDIR%%/app/assets/javascripts/error_tracking/details.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/list.js
 %%WWWDIR%%/app/assets/javascripts/error_tracking/services/index.js
-%%WWWDIR%%/app/assets/javascripts/error_tracking/store/actions.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/details/actions.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/details/getters.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/details/mutation_types.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/details/mutations.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/details/state.js
 %%WWWDIR%%/app/assets/javascripts/error_tracking/store/index.js
-%%WWWDIR%%/app/assets/javascripts/error_tracking/store/mutation_types.js
-%%WWWDIR%%/app/assets/javascripts/error_tracking/store/mutations.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/list/actions.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/list/getters.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/list/mutation_types.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/list/mutations.js
+%%WWWDIR%%/app/assets/javascripts/error_tracking/store/list/state.js
 %%WWWDIR%%/app/assets/javascripts/error_tracking/utils.js
 %%WWWDIR%%/app/assets/javascripts/error_tracking_settings/components/app.vue
 %%WWWDIR%%/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue
@@ -2437,6 +2464,13 @@
 %%WWWDIR%%/app/assets/javascripts/gl_field_errors.js
 %%WWWDIR%%/app/assets/javascripts/gl_form.js
 %%WWWDIR%%/app/assets/javascripts/gpg_badges.js
+%%WWWDIR%%/app/assets/javascripts/grafana_integration/components/grafana_integration.vue
+%%WWWDIR%%/app/assets/javascripts/grafana_integration/index.js
+%%WWWDIR%%/app/assets/javascripts/grafana_integration/store/actions.js
+%%WWWDIR%%/app/assets/javascripts/grafana_integration/store/index.js
+%%WWWDIR%%/app/assets/javascripts/grafana_integration/store/mutation_types.js
+%%WWWDIR%%/app/assets/javascripts/grafana_integration/store/mutations.js
+%%WWWDIR%%/app/assets/javascripts/grafana_integration/store/state.js
 %%WWWDIR%%/app/assets/javascripts/graphql_shared/fragments/pageInfo.fragment.graphql
 %%WWWDIR%%/app/assets/javascripts/group.js
 %%WWWDIR%%/app/assets/javascripts/group_label_subscription.js
@@ -2553,6 +2587,8 @@
 %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/branches/mutation_types.js
 %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/branches/mutations.js
 %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/branches/state.js
+%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/clientside/actions.js
+%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/clientside/index.js
 %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/actions.js
 %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/constants.js
 %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/getters.js
@@ -2639,6 +2675,11 @@
 %%WWWDIR%%/app/assets/javascripts/issuable_suggestions/components/item.vue
 %%WWWDIR%%/app/assets/javascripts/issuable_suggestions/index.js
 %%WWWDIR%%/app/assets/javascripts/issuable_suggestions/queries/issues.query.graphql
+%%WWWDIR%%/app/assets/javascripts/issuables_list/components/issuable.vue
+%%WWWDIR%%/app/assets/javascripts/issuables_list/components/issuables_list_app.vue
+%%WWWDIR%%/app/assets/javascripts/issuables_list/constants.js
+%%WWWDIR%%/app/assets/javascripts/issuables_list/eventhub.js
+%%WWWDIR%%/app/assets/javascripts/issuables_list/index.js
 %%WWWDIR%%/app/assets/javascripts/issue.js
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/app.vue
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/description.vue
@@ -2739,7 +2780,6 @@
 %%WWWDIR%%/app/assets/javascripts/lib/utils/suppress_ajax_errors_during_navigation.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/text_markdown.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/text_utility.js
-%%WWWDIR%%/app/assets/javascripts/lib/utils/tick_formats.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/type_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/url_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/users_cache.js
@@ -2770,8 +2810,10 @@
 %%WWWDIR%%/app/assets/javascripts/mirrors/constants.js
 %%WWWDIR%%/app/assets/javascripts/mirrors/mirror_repos.js
 %%WWWDIR%%/app/assets/javascripts/mirrors/ssh_mirror.js
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/anomaly.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/column.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/empty_chart.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/heatmap.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/single_stat.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/time_series.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -2781,6 +2823,7 @@
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/empty_state.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph_group.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/panel_type.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/shared/prometheus_header.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/constants.js
 %%WWWDIR%%/app/assets/javascripts/monitoring/monitoring_bundle.js
 %%WWWDIR%%/app/assets/javascripts/monitoring/stores/actions.js
@@ -2820,6 +2863,7 @@
 %%WWWDIR%%/app/assets/javascripts/notebook/lib/highlight.js
 %%WWWDIR%%/app/assets/javascripts/notes.js
 %%WWWDIR%%/app/assets/javascripts/notes/components/comment_form.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/diff_discussion_header.vue
 %%WWWDIR%%/app/assets/javascripts/notes/components/diff_with_note.vue
 %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_actions.vue
 %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -2851,6 +2895,7 @@
 %%WWWDIR%%/app/assets/javascripts/notes/event_hub.js
 %%WWWDIR%%/app/assets/javascripts/notes/index.js
 %%WWWDIR%%/app/assets/javascripts/notes/mixins/autosave.js

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-branches mailing list