Index: branches/2019Q4/devel/gitlab-shell/Makefile =================================================================== --- branches/2019Q4/devel/gitlab-shell/Makefile (revision 516426) +++ branches/2019Q4/devel/gitlab-shell/Makefile (revision 516427) @@ -1,93 +1,93 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 10.0.0 +PORTVERSION= 10.2.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= GitLab Shell handles git commands for GitLab LICENSE= MIT BUILD_DEPENDS= gem:devel/ruby-gems USES= gmake go:modules,no_targets MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" ALL_TARGET= build USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags -GL_COMMIT= 996b2e1d44cc671cc60fd4ddacd2c5750b72a025 +GL_COMMIT= 9ed13ca8848b2020bbcd8a52120a58731730745a +BUILD_DEPENDS= rubygem-bundler1=1.17.3:sysutils/rubygem-bundler1 + USERS= git GROUPS= git INSTALL_TARGET= install-strip # for go dependencies USE_GITHUB= nodefault -# generated with gomod-deps below +# generated with: make gomod-deps +# Make sure you have here the path .../go/vendor/... and not .../vendor/... GH_TUPLE= \ DataDog:dd-trace-go:v1.9.0:datadog_dd_trace_go/go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/go/vendor/github.com/codahale/hdrhistogram \ davecgh:go-spew:v1.1.1:davecgh_go_spew/go/vendor/github.com/davecgh/go-spew \ - go-yaml:yaml:v2.2.1:go_yaml_yaml/go/vendor/gopkg.in/yaml.v2 \ - golang:crypto:182114d58262:golang_crypto/go/vendor/golang.org/x/crypto \ - golang:net:10aee1819953:golang_net/go/vendor/golang.org/x/net \ - golang:protobuf:v1.2.0:golang_protobuf/go/vendor/github.com/golang/protobuf \ - golang:sys:70b957f3b65e:golang_sys/go/vendor/golang.org/x/sys \ + go-yaml:yaml:v2.2.2:go_yaml_yaml/go/vendor/gopkg.in/yaml.v2 \ + golang:crypto:20be4c3c3ed5:golang_crypto/go/vendor/golang.org/x/crypto \ + golang:net:d28f0bde5980:golang_net/go/vendor/golang.org/x/net \ + golang:protobuf:v1.3.2:golang_protobuf/go/vendor/github.com/golang/protobuf \ + golang:sys:953cdadca894:golang_sys/go/vendor/golang.org/x/sys \ golang:text:v0.3.0:golang_text/go/vendor/golang.org/x/text \ google:go-genproto:bd91e49a0898:google_go_genproto/go/vendor/google.golang.org/genproto \ grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/go/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ - grpc:grpc-go:v1.16.0:grpc_grpc_go/go/vendor/google.golang.org/grpc \ + grpc:grpc-go:v1.24.0:grpc_grpc_go/go/vendor/google.golang.org/grpc \ + konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/go/vendor/github.com/konsorten/go-windows-terminal-sequences \ lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/go/vendor/github.com/lightstep/lightstep-tracer-go \ mattn:go-shellwords:2444a32a19f4:mattn_go_shellwords/go/vendor/github.com/mattn/go-shellwords \ opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/go/vendor/github.com/opentracing/opentracing-go \ otiai10:copy:v1.0.1:otiai10_copy/go/vendor/github.com/otiai10/copy \ philhofer:fwd:v1.0.0:philhofer_fwd/go/vendor/github.com/philhofer/fwd \ pkg:errors:v0.8.0:pkg_errors/go/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/go/vendor/github.com/pmezard/go-difflib \ - sirupsen:logrus:v1.0.5:sirupsen_logrus/go/vendor/github.com/sirupsen/logrus \ - stretchr:testify:v1.2.2:stretchr_testify/go/vendor/github.com/stretchr/testify \ - tinylib:msgp:v1.0.2:tinylib_msgp/go/vendor/github.com/tinylib/msgp \ + sirupsen:logrus:v1.2.0:sirupsen_logrus/go/vendor/github.com/sirupsen/logrus \ + stretchr:testify:v1.3.0:stretchr_testify/go/vendor/github.com/stretchr/testify \ + tinylib:msgp:v1.1.0:tinylib_msgp/go/vendor/github.com/tinylib/msgp \ uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/go/vendor/github.com/uber/jaeger-client-go \ uber:jaeger-lib:v1.5.0:uber_jaeger_lib/go/vendor/github.com/uber/jaeger-lib GL_TUPLE= \ - gitlab-org:gitaly-proto:53d58cd1f691f0370aca152927db89a6b6fbab59:gitlab_org_gitaly_proto/go/vendor/gitlab.com/gitlab-org/gitaly-proto \ - gitlab-org:gitaly:52d67af596f75e82305f16ff0f27a9e0e77d57e1:gitlab_org_gitaly/go/vendor/gitlab.com/gitlab-org/gitaly \ + gitlab-org:gitaly:aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb:gitlab_org_gitaly/go/vendor/gitlab.com/gitlab-org/gitaly \ gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/go/vendor/gitlab.com/gitlab-org/labkit post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample ${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml # Build the go deps, use `pkg install modules2tuple` gomod-deps: patch (cd ${WRKSRC}/go && go mod vendor) - (cd ${WRKSRC}/go && modules2tuple vendor/modules.txt) + (cd ${WRKSRC}/go && modules2tuple -prefix go/vendor vendor/modules.txt) -#export GOCACHE=${WRKSRC}/go && ${WRKSRC}/bin/compile pre-build: - (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} bin/compile) - @(cd ${WRKSRC}; ${MAKE_CMD} build) - @(cd ${WRKSRC}; ${MAKE_CMD} compile) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build) pre-install: ${RM} -rf ${WRKSRC}/config.yml #${RM} -rf ${WRKSRC}/go_build do-install: @${MKDIR} ${STAGEDIR}${DATADIR} .for x in .codeclimate.yml .gitignore .gitlab-ci.yml .rubocop.yml .ruby-version CHANGELOG CONTRIBUTING.md Gemfile Gemfile.lock LICENSE README.md VERSION config.yml.sample ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DATADIR}/ .endfor -.for x in bin spec lib hooks support .gitlab +.for x in bin spec hooks support .gitlab @${MKDIR} ${STAGEDIR}${DATADIR}/${x} (cd ${WRKSRC}/${x} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${x}) .endfor @${MKDIR} ${STAGEDIR}/var/log/gitlab-shell .include Index: branches/2019Q4/devel/gitlab-shell/distinfo =================================================================== --- branches/2019Q4/devel/gitlab-shell/distinfo (revision 516426) +++ branches/2019Q4/devel/gitlab-shell/distinfo (revision 516427) @@ -1,57 +1,57 @@ -TIMESTAMP = 1569854307 +TIMESTAMP = 1571857315 SHA256 (DataDog-dd-trace-go-v1.9.0_GH0.tar.gz) = 923dfedb4d94e6ff32488fd444d1de5f7ee0c9dfa6da4ef3f21d9e199021e005 SIZE (DataDog-dd-trace-go-v1.9.0_GH0.tar.gz) = 436588 SHA256 (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 3ef6b86658bc370e027304e55a8685767f7fd8a94199f4bea08c9388bf84a1b0 SIZE (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 7738 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 -SHA256 (go-yaml-yaml-v2.2.1_GH0.tar.gz) = 33218aa3bd60a307fe14e66b970473cb411bb6ca3d4f4a5e30c97b44f9b4e84b -SIZE (go-yaml-yaml-v2.2.1_GH0.tar.gz) = 70217 -SHA256 (golang-crypto-182114d58262_GH0.tar.gz) = 103ee3825d51535105e14db9337202e65b99f97e06648de44cbe0155a93a16b6 -SIZE (golang-crypto-182114d58262_GH0.tar.gz) = 1451246 -SHA256 (golang-net-10aee1819953_GH0.tar.gz) = 5dc6670030f663160c5a018e928d713e8eda9f16ccf3d1f4b014148586058d19 -SIZE (golang-net-10aee1819953_GH0.tar.gz) = 967363 -SHA256 (golang-protobuf-v1.2.0_GH0.tar.gz) = 157a148ae4e132eb169ec794b6cb43f1002780eeacaea8b0694811d1948fb1ec -SIZE (golang-protobuf-v1.2.0_GH0.tar.gz) = 332565 -SHA256 (golang-sys-70b957f3b65e_GH0.tar.gz) = c3913b484358c3eacb5eb8dbfd25d93dd49249bf2f20fbe2b0b96d1755c8ae3d -SIZE (golang-sys-70b957f3b65e_GH0.tar.gz) = 1119411 +SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff +SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656 +SHA256 (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = bc78136186ecd1683395d9094a7b973cb01675529131ac59f484e2716609de6f +SIZE (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = 1690016 +SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4 +SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062 +SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 +SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 +SHA256 (golang-sys-953cdadca894_GH0.tar.gz) = fb56f244784dac7e7f66fc0ff9f5ff6adbd49ccb8f3625285e6e39254b64c12f +SIZE (golang-sys-953cdadca894_GH0.tar.gz) = 1353286 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377 SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775 SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2fc2b5a509baceccb4e51d841fa13ed409e16455435e6917b SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266 -SHA256 (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 771230b79dc89753e860b35870ec245b19248b538f0de3fe45d818281739167a -SIZE (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 545087 +SHA256 (grpc-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b +SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074 +SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87 +SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909 SHA256 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14 SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986 SHA256 (mattn-go-shellwords-2444a32a19f4_GH0.tar.gz) = 34a5c6349c3917583f4c69c41941891490fedbd34bd779139953282eb01b28c4 SIZE (mattn-go-shellwords-2444a32a19f4_GH0.tar.gz) = 4326 SHA256 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067 SHA256 (otiai10-copy-v1.0.1_GH0.tar.gz) = 44e2d330e53f7ae1088502a758a17131f5091fb86481228af8f25a27e1f241e7 SIZE (otiai10-copy-v1.0.1_GH0.tar.gz) = 3578 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221 SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5 SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 -SHA256 (sirupsen-logrus-v1.0.5_GH0.tar.gz) = 0c422c0f06eb8a67a7c3ce6814d92b866e47b88ad33948c6c009f48ccfbe935f -SIZE (sirupsen-logrus-v1.0.5_GH0.tar.gz) = 28746 -SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f -SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698 -SHA256 (tinylib-msgp-v1.0.2_GH0.tar.gz) = 3769a1d074e1e8a1903d26c0cf36ad249848d3a0b2a78c20b8040cfd6ce3811f -SIZE (tinylib-msgp-v1.0.2_GH0.tar.gz) = 68340 +SHA256 (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 679aa05d23ca81b74f1327e7a25267a322dc9fd807a276e73e781f62ee679c6d +SIZE (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 37794 +SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5 +SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859 +SHA256 (tinylib-msgp-v1.1.0_GH0.tar.gz) = 30ac583b725d84aee147c26d1bc31e8770a3911e8437461cda0e53fb69c54570 +SIZE (tinylib-msgp-v1.1.0_GH0.tar.gz) = 77923 SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137df072e2c1f7b15feb69a8ef8963804c44c94 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655 -SHA256 (gitlab-org-gitlab-shell-996b2e1d44cc671cc60fd4ddacd2c5750b72a025_GL0.tar.gz) = d5c9bd16ee28e329b0c6705efcca0fc4c0009e2c56116f1f5f9c86e9af9d6638 -SIZE (gitlab-org-gitlab-shell-996b2e1d44cc671cc60fd4ddacd2c5750b72a025_GL0.tar.gz) = 87799 -SHA256 (gitlab-org-gitaly-proto-53d58cd1f691f0370aca152927db89a6b6fbab59_GL0.tar.gz) = df5509fc4c8384d9541f30ef0826e4c929e72b86a44bde9a030fd0ccd4b7247b -SIZE (gitlab-org-gitaly-proto-53d58cd1f691f0370aca152927db89a6b6fbab59_GL0.tar.gz) = 127622 -SHA256 (gitlab-org-gitaly-52d67af596f75e82305f16ff0f27a9e0e77d57e1_GL0.tar.gz) = e6bda13673548eec3938f15ee3762feaa741f726b490135e137df302f4ce83d6 -SIZE (gitlab-org-gitaly-52d67af596f75e82305f16ff0f27a9e0e77d57e1_GL0.tar.gz) = 4257639 +SHA256 (gitlab-org-gitlab-shell-9ed13ca8848b2020bbcd8a52120a58731730745a_GL0.tar.gz) = d9a9a527055d0c3b29bea193f12fbdbede6e0c9319aaa64d0d59791e738176a5 +SIZE (gitlab-org-gitlab-shell-9ed13ca8848b2020bbcd8a52120a58731730745a_GL0.tar.gz) = 60565 +SHA256 (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 717aaa0210924db6f537dbe06e6b373e687fb73ec11f1e0a9f6b12cf4dbc1ce1 +SIZE (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 2773612 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466 Index: branches/2019Q4/devel/gitlab-shell/pkg-plist =================================================================== --- branches/2019Q4/devel/gitlab-shell/pkg-plist (revision 516426) +++ branches/2019Q4/devel/gitlab-shell/pkg-plist (revision 516427) @@ -1,123 +1,39 @@ %%DATADIR%%/.codeclimate.yml %%DATADIR%%/.gitignore %%DATADIR%%/.gitlab-ci.yml %%DATADIR%%/.rubocop.yml %%DATADIR%%/.ruby-version %%DATADIR%%/CHANGELOG %%DATADIR%%/CONTRIBUTING.md %%DATADIR%%/Gemfile %%DATADIR%%/Gemfile.lock %%DATADIR%%/LICENSE %%DATADIR%%/README.md %%DATADIR%%/VERSION %%DATADIR%%/.gitlab/CODEOWNERS @(,,555) %%DATADIR%%/bin/authorized_keys @(,,555) %%DATADIR%%/bin/check @(,,555) %%DATADIR%%/bin/compile -@(,,555) %%DATADIR%%/bin/create-hooks -@(,,555) %%DATADIR%%/bin/gitaly-upload-archive -@(,,555) %%DATADIR%%/bin/gitaly-upload-pack -@(,,555) %%DATADIR%%/bin/gitaly-receive-pack @(,,555) %%DATADIR%%/bin/gitlab-shell @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check -@(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check-ruby @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-principals-check -@(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-principals-check-ruby -@(,,555) %%DATADIR%%/bin/gitlab-shell-ruby @(,,555) %%DATADIR%%/bin/install -@(,,555) %%DATADIR%%/bin/test-logger @sample %%DATADIR%%/config.yml.sample @(,,555) %%DATADIR%%/hooks/post-receive @(,,555) %%DATADIR%%/hooks/pre-receive @(,,555) %%DATADIR%%/hooks/update -%%DATADIR%%/lib/action.rb -%%DATADIR%%/lib/action/custom.rb -%%DATADIR%%/lib/console_helper.rb -%%DATADIR%%/lib/gitlab_access_status.rb -%%DATADIR%%/lib/gitlab_config.rb -%%DATADIR%%/lib/gitlab_init.rb -%%DATADIR%%/lib/gitlab_keys.rb -%%DATADIR%%/lib/gitlab_lfs_authentication.rb -%%DATADIR%%/lib/gitlab_logger.rb -%%DATADIR%%/lib/gitlab_metrics.rb -%%DATADIR%%/lib/gitlab_net.rb -%%DATADIR%%/lib/gitlab_net/errors.rb -%%DATADIR%%/lib/gitlab_shell.rb -%%DATADIR%%/lib/hooks_utils.rb -%%DATADIR%%/lib/httpunix.rb -%%DATADIR%%/lib/http_helper.rb -%%DATADIR%%/lib/object_dirs_helper.rb -%%DATADIR%%/spec/action/custom_spec.rb -%%DATADIR%%/spec/console_helper_spec.rb -%%DATADIR%%/spec/gitlab_config_spec.rb -%%DATADIR%%/spec/gitlab_keys_spec.rb -%%DATADIR%%/spec/gitlab_lfs_authentication_spec.rb -%%DATADIR%%/spec/gitlab_logger_spec.rb -%%DATADIR%%/spec/gitlab_metrics_spec.rb -%%DATADIR%%/spec/gitlab_net_spec.rb %%DATADIR%%/spec/gitlab_shell_authorized_keys_check_spec.rb %%DATADIR%%/spec/gitlab_shell_authorized_principals_check_spec.rb %%DATADIR%%/spec/gitlab_shell_custom_git_receive_pack_spec.rb -%%DATADIR%%/spec/gitlab_shell_gitlab_shell_spec.rb +%%DATADIR%%/spec/gitlab_shell_discover_spec.rb %%DATADIR%%/spec/gitlab_shell_lfs_authentication_spec.rb -%%DATADIR%%/spec/gitlab_shell_spec.rb %%DATADIR%%/spec/gitlab_shell_two_factor_recovery_spec.rb -%%DATADIR%%/spec/hooks_utils_spec.rb -%%DATADIR%%/spec/httpunix_spec.rb -%%DATADIR%%/spec/object_dirs_helper_spec.rb %%DATADIR%%/spec/spec_helper.rb %%DATADIR%%/spec/support/gitlab_shell_setup.rb -%%DATADIR%%/spec/support/gl_id_test_hook %%DATADIR%%/spec/support/http_unix_server.rb -%%DATADIR%%/spec/support/hook_fail -%%DATADIR%%/spec/support/hook_ok -%%DATADIR%%/spec/support/vcr.rb -%%DATADIR%%/spec/support/webmock.rb -%%DATADIR%%/spec/vcr_cassettes/allowed-pull.yml -%%DATADIR%%/spec/vcr_cassettes/allowed-push.yml -%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml -%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml -%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404.yml -%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml -%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml -%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found.yml -%%DATADIR%%/spec/vcr_cassettes/broadcast_message-none.yml -%%DATADIR%%/spec/vcr_cassettes/broadcast_message-ok.yml -%%DATADIR%%/spec/vcr_cassettes/check-ok.yml -%%DATADIR%%/spec/vcr_cassettes/custom-action-not-ok-json.yml -%%DATADIR%%/spec/vcr_cassettes/custom-action-not-ok-not-json.yml -%%DATADIR%%/spec/vcr_cassettes/custom-action-ok-not-json.yml -%%DATADIR%%/spec/vcr_cassettes/custom-action-ok-with-message.yml -%%DATADIR%%/spec/vcr_cassettes/custom-action-ok.yml -%%DATADIR%%/spec/vcr_cassettes/discover-ok.yml -%%DATADIR%%/spec/vcr_cassettes/http-pull-disabled.yml -%%DATADIR%%/spec/vcr_cassettes/http-push-disabled.yml -%%DATADIR%%/spec/vcr_cassettes/lfs-authenticate-ok-download.yml -%%DATADIR%%/spec/vcr_cassettes/lfs-authenticate-ok-upload.yml -%%DATADIR%%/spec/vcr_cassettes/notify-post-receive.yml -%%DATADIR%%/spec/vcr_cassettes/post-receive-not-found.yml -%%DATADIR%%/spec/vcr_cassettes/post-receive.yml -%%DATADIR%%/spec/vcr_cassettes/pre-receive-not-found.yml -%%DATADIR%%/spec/vcr_cassettes/pre-receive.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-key-not-found.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-key-not-implemented.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-key-ok.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-pull-disabled.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-push-disabled.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied.yml -%%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml -%%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes.yml +%%DATADIR%%/support/gitlab_config.rb %%DATADIR%%/support/go-format %%DATADIR%%/support/go-test %%DATADIR%%/support/go_build.rb -%%DATADIR%%/support/rewrite-hooks.sh %%DATADIR%%/support/truncate_repositories.sh @dir(git,,755) /var/log/gitlab-shell Index: branches/2019Q4 =================================================================== --- branches/2019Q4 (revision 516426) +++ branches/2019Q4 (revision 516427) Property changes on: branches/2019Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r515489