Index: branches/2019Q4/devel/gitaly/Makefile =================================================================== --- branches/2019Q4/devel/gitaly/Makefile (revision 516425) +++ branches/2019Q4/devel/gitaly/Makefile (revision 516426) @@ -1,108 +1,105 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 1.65.1 +DISTVERSION= 1.67.0 PORTREVISION= 0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.21:devel/git \ rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \ rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \ rubygem-github-linguist>=6.1<7.0:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-activesupport52>=5.2.3<5.3.0:devel/rubygem-activesupport52 \ rubygem-rdoc>=6.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.7<4.2.8.0:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ rubygem-grpc>=1.19.0<1.20.0:net/rubygem-grpc \ rubygem-sentry-raven>=2.9.0<2.10.0:devel/rubygem-sentry-raven \ rubygem-faraday>=0.12<1.0:www/rubygem-faraday \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ rubygem-gitlab-labkit>=0.5.0<0.6.0:devel/rubygem-gitlab-labkit \ rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \ rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371 BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=9.3.0:devel/gitlab-shell USES= gmake go:modules,no_targets USE_RUBY= yes MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= 11980609ad78842b5cf83899d1bb002bbbe9ba2d +GL_COMMIT= ca21a624582be7bcf4d43075be2a7e5981e191fa # for go dependencies USE_GITHUB= nodefault -# generated with gomod-deps below +# generated with: make gomod-vendor GH_TUPLE= \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \ certifi:gocertifi:ee1a9a0726d2:certifi_gocertifi/vendor/github.com/certifi/gocertifi \ cloudflare:tableflip:8392f1641731:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \ codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \ + go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ golang:crypto:20be4c3c3ed5:golang_crypto/vendor/golang.org/x/crypto \ golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \ golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:37e7f081c4d4:golang_sync/vendor/golang.org/x/sync \ golang:sys:953cdadca894:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \ google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \ grpc:grpc-go:v1.16.0:grpc_grpc_go/vendor/google.golang.org/grpc \ kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \ konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ libgit2:git2go:ecaeb7a21d47:libgit2_git2go/vendor/github.com/libgit2/git2go \ lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ prometheus:client_golang:v1.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \ prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \ prometheus:procfs:v0.0.2:prometheus_procfs/vendor/github.com/prometheus/procfs \ sirupsen:logrus:v1.2.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify \ tinylib:msgp:v1.1.0:tinylib_msgp/vendor/github.com/tinylib/msgp \ uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \ uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib GL_TUPLE= \ gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample -# Build the go deps, use `pkg install modules2tuple` -gomod-deps: patch - (cd ${WRKSRC} && go mod vendor) - (cd ${WRKSRC} && modules2tuple vendor/modules.txt) - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete (cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/bin && \ cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample ${STAGEDIR}${DATADIR}) && \ cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby .include + Index: branches/2019Q4/devel/gitaly/distinfo =================================================================== --- branches/2019Q4/devel/gitaly/distinfo (revision 516425) +++ branches/2019Q4/devel/gitaly/distinfo (revision 516426) @@ -1,79 +1,81 @@ -TIMESTAMP = 1569914858 +TIMESTAMP = 1571855950 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111 SHA256 (beorn7-perks-v1.0.0_GH0.tar.gz) = b69d92e2e84b7d510dfa6110d3ac4ada0096a6c81190c5e174aa888bfe475cbc SIZE (beorn7-perks-v1.0.0_GH0.tar.gz) = 10866 SHA256 (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = b0b9ac422d6378c82be85f71f206757db24ecad314aca6155e9954363817fae1 SIZE (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = 143846 SHA256 (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 0fab510fb61d488f63c59485dadb166d7d5fac5ebbd65e6a3cacfc9fdd1fb6d3 SIZE (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 12582 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 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5 SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314 +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.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884 SHA256 (golang-sync-37e7f081c4d4_GH0.tar.gz) = d0f0ce92264903fa32032fc365c0c0d36d129fa282d74364c406179a94714f10 SIZE (golang-sync-37e7f081c4d4_GH0.tar.gz) = 16238 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 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423 SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543 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-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9 SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 SHA256 (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 771230b79dc89753e860b35870ec245b19248b538f0de3fe45d818281739167a SIZE (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 545087 SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 3556a0d014ba778b78955e8ec9fc320de81509f4aa582ea3b6ce18476c3e40dd SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408 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 (libgit2-git2go-ecaeb7a21d47_GH0.tar.gz) = 2a7cd9579aad7f046795f26c17a92d79f6caded6a512cc37d366a6ae7e28b396 SIZE (libgit2-git2go-ecaeb7a21d47_GH0.tar.gz) = 72760 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 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 SHA256 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067 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 (prometheus-client_golang-v1.0.0_GH0.tar.gz) = afee7b61a77342cc24ea55e284d08688267efca1843e529a51799fe52c5ee662 SIZE (prometheus-client_golang-v1.0.0_GH0.tar.gz) = 138046 SHA256 (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 17571c708bab9a1ba18d9dd0c9bfe96dff3f1b84c63e7d8d4c3489ef5c34ee40 SIZE (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 57491 SHA256 (prometheus-common-v0.4.1_GH0.tar.gz) = 99229ef4b100e55d1e6496995f1a1af6813426b8820521bc041340eb077985b9 SIZE (prometheus-common-v0.4.1_GH0.tar.gz) = 98631 SHA256 (prometheus-procfs-v0.0.2_GH0.tar.gz) = ad1d1f1328a1c394b30225b939ed39482ba54de7be70d439c0555d68857457d5 SIZE (prometheus-procfs-v0.0.2_GH0.tar.gz) = 78550 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-gitaly-11980609ad78842b5cf83899d1bb002bbbe9ba2d_GL0.tar.gz) = 5ed966452dd45681d4b7ce66a2118284f4a9c5b41a0fd73e9df27013eb4ce011 -SIZE (gitlab-org-gitaly-11980609ad78842b5cf83899d1bb002bbbe9ba2d_GL0.tar.gz) = 2749759 +SHA256 (gitlab-org-gitaly-ca21a624582be7bcf4d43075be2a7e5981e191fa_GL0.tar.gz) = 92d38de0294338d8b9bb27205f799c60b5bed2e0ac651a87029fc203301a688a +SIZE (gitlab-org-gitaly-ca21a624582be7bcf4d43075be2a7e5981e191fa_GL0.tar.gz) = 2772214 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466 Index: branches/2019Q4/devel/gitaly/pkg-plist =================================================================== --- branches/2019Q4/devel/gitaly/pkg-plist (revision 516425) +++ branches/2019Q4/devel/gitaly/pkg-plist (revision 516426) @@ -1,237 +1,238 @@ %%DATADIR%%/ruby/Gemfile %%DATADIR%%/ruby/README.md @(,,555) %%DATADIR%%/ruby/bin/gitaly-ruby @(,,555) %%DATADIR%%/ruby/bin/ruby-cd %%DATADIR%%/ruby/.rubocop.yml %%DATADIR%%/ruby/.rubocop_todo.yml %%DATADIR%%/ruby/git-hooks/post-receive %%DATADIR%%/ruby/git-hooks/pre-receive %%DATADIR%%/ruby/git-hooks/update %%DATADIR%%/ruby/gitlab-shell/.codeclimate.yml %%DATADIR%%/ruby/gitlab-shell/.gitlab-ci.yml %%DATADIR%%/ruby/gitlab-shell/.rubocop.yml %%DATADIR%%/ruby/gitlab-shell/.ruby-version %%DATADIR%%/ruby/gitlab-shell/CHANGELOG %%DATADIR%%/ruby/gitlab-shell/CONTRIBUTING.md %%DATADIR%%/ruby/gitlab-shell/Gemfile %%DATADIR%%/ruby/gitlab-shell/LICENSE %%DATADIR%%/ruby/gitlab-shell/README.md %%DATADIR%%/ruby/gitlab-shell/README.orig.md %%DATADIR%%/ruby/gitlab-shell/VERSION %%DATADIR%%/ruby/gitlab-shell/bin/check %%DATADIR%%/ruby/gitlab-shell/bin/dump-config %%DATADIR%%/ruby/gitlab-shell/bin/test-logger %%DATADIR%%/ruby/gitlab-shell/config.yml.example %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access_status.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_config.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_custom_hook.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_init.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_logger.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_metrics.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net/errors.rb %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_post_receive.rb %%DATADIR%%/ruby/gitlab-shell/lib/hooks_utils.rb %%DATADIR%%/ruby/gitlab-shell/lib/http_helper.rb %%DATADIR%%/ruby/gitlab-shell/lib/httpunix.rb %%DATADIR%%/ruby/gitlab-shell/lib/message.rb %%DATADIR%%/ruby/gitlab-shell/lib/object_dirs_helper.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_access_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_config_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_custom_hook_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_logger_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_metrics_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_net_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/hooks_utils_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/httpunix_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/spec_helper.rb %%DATADIR%%/ruby/gitlab-shell/spec/support/gitlab_shell_setup.rb %%DATADIR%%/ruby/gitlab-shell/spec/support/gl_id_test_hook %%DATADIR%%/ruby/gitlab-shell/spec/support/hook_fail %%DATADIR%%/ruby/gitlab-shell/spec/support/hook_ok %%DATADIR%%/ruby/gitlab-shell/spec/support/http_unix_server.rb %%DATADIR%%/ruby/gitlab-shell/spec/support/vcr.rb %%DATADIR%%/ruby/gitlab-shell/spec/support/webmock.rb %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml %%DATADIR%%/ruby/lib/gitaly_server.rb %%DATADIR%%/ruby/lib/gitaly_server/blob_service.rb %%DATADIR%%/ruby/lib/gitaly_server/client.rb %%DATADIR%%/ruby/lib/gitaly_server/commit_service.rb %%DATADIR%%/ruby/lib/gitaly_server/conflicts_service.rb %%DATADIR%%/ruby/lib/gitaly_server/diff_service.rb %%DATADIR%%/ruby/lib/gitaly_server/exception_sanitizer_interceptor.rb %%DATADIR%%/ruby/lib/gitaly_server/health_service.rb %%DATADIR%%/ruby/lib/gitaly_server/operations_service.rb %%DATADIR%%/ruby/lib/gitaly_server/ref_service.rb %%DATADIR%%/ruby/lib/gitaly_server/remote_service.rb %%DATADIR%%/ruby/lib/gitaly_server/repository_service.rb %%DATADIR%%/ruby/lib/gitaly_server/rugged_interceptor.rb %%DATADIR%%/ruby/lib/gitaly_server/sentry.rb %%DATADIR%%/ruby/lib/gitaly_server/sentry_interceptor.rb %%DATADIR%%/ruby/lib/gitaly_server/utils.rb %%DATADIR%%/ruby/lib/gitaly_server/wiki_service.rb %%DATADIR%%/ruby/lib/gitlab/config.rb %%DATADIR%%/ruby/lib/gitlab/encoding_helper.rb %%DATADIR%%/ruby/lib/gitlab/git.rb %%DATADIR%%/ruby/lib/gitlab/git/blob.rb %%DATADIR%%/ruby/lib/gitlab/git/branch.rb %%DATADIR%%/ruby/lib/gitlab/git/commit.rb %%DATADIR%%/ruby/lib/gitlab/git/commit_patches.rb %%DATADIR%%/ruby/lib/gitlab/git/committer_with_hooks.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/file.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/parser.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/resolution.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/resolver.rb %%DATADIR%%/ruby/lib/gitlab/git/gitaly_remote_repository.rb %%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb %%DATADIR%%/ruby/lib/gitlab/git/hook.rb %%DATADIR%%/ruby/lib/gitlab/git/hooks_service.rb %%DATADIR%%/ruby/lib/gitlab/git/http_auth.rb %%DATADIR%%/ruby/lib/gitlab/git/index.rb %%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb %%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb %%DATADIR%%/ruby/lib/gitlab/git/path_helper.rb %%DATADIR%%/ruby/lib/gitlab/git/popen.rb %%DATADIR%%/ruby/lib/gitlab/git/ref.rb %%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb %%DATADIR%%/ruby/lib/gitlab/git/remote_repository.rb %%DATADIR%%/ruby/lib/gitlab/git/repository.rb %%DATADIR%%/ruby/lib/gitlab/git/repository_mirroring.rb %%DATADIR%%/ruby/lib/gitlab/git/rev_list.rb %%DATADIR%%/ruby/lib/gitlab/git/ssh_auth.rb %%DATADIR%%/ruby/lib/gitlab/git/submodule.rb %%DATADIR%%/ruby/lib/gitlab/git/tag.rb %%DATADIR%%/ruby/lib/gitlab/git/user.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_file.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_page.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_page_version.rb %%DATADIR%%/ruby/lib/gitlab/git/worktree.rb %%DATADIR%%/ruby/lib/gitlab/git_logger.rb %%DATADIR%%/ruby/lib/gitlab/gollum.rb %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb %%DATADIR%%/ruby/lib/gitlab/ref_matcher.rb %%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb %%DATADIR%%/ruby/proto/README.md %%DATADIR%%/ruby/proto/gitaly.rb %%DATADIR%%/ruby/proto/gitaly/blob_pb.rb %%DATADIR%%/ruby/proto/gitaly/blob_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/cleanup_pb.rb %%DATADIR%%/ruby/proto/gitaly/cleanup_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/commit_pb.rb %%DATADIR%%/ruby/proto/gitaly/commit_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/conflicts_pb.rb %%DATADIR%%/ruby/proto/gitaly/conflicts_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/diff_pb.rb %%DATADIR%%/ruby/proto/gitaly/diff_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/namespace_pb.rb %%DATADIR%%/ruby/proto/gitaly/namespace_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/objectpool_pb.rb %%DATADIR%%/ruby/proto/gitaly/objectpool_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/operations_pb.rb %%DATADIR%%/ruby/proto/gitaly/operations_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/ref_pb.rb %%DATADIR%%/ruby/proto/gitaly/ref_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/remote_pb.rb %%DATADIR%%/ruby/proto/gitaly/remote_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/repository-service_pb.rb %%DATADIR%%/ruby/proto/gitaly/repository-service_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/server_pb.rb %%DATADIR%%/ruby/proto/gitaly/server_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/shared_pb.rb %%DATADIR%%/ruby/proto/gitaly/smarthttp_pb.rb %%DATADIR%%/ruby/proto/gitaly/smarthttp_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/ssh_pb.rb %%DATADIR%%/ruby/proto/gitaly/ssh_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/storage_pb.rb %%DATADIR%%/ruby/proto/gitaly/storage_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/version.rb %%DATADIR%%/ruby/proto/gitaly/wiki_pb.rb %%DATADIR%%/ruby/proto/gitaly/wiki_services_pb.rb %%DATADIR%%/ruby/spec/factories/gitaly/commit.rb %%DATADIR%%/ruby/spec/factories/gitaly/commit_author.rb %%DATADIR%%/ruby/spec/factories/sequences.rb %%DATADIR%%/ruby/spec/gitaly/ref_service_spec.rb %%DATADIR%%/ruby/spec/gitaly/remote_service_spec.rb %%DATADIR%%/ruby/spec/gitaly/repository_service_spec.rb %%DATADIR%%/ruby/spec/lib/gitaly_server/exception_sanitizer_interceptor_spec.rb %%DATADIR%%/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb %%DATADIR%%/ruby/spec/lib/gitaly_server/utils_spec.rb %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/config_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/blob_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/branch_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/commit_patches_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/commit_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/gitlab_projects_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/hook_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/lfs_changes_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/popen_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_mirror_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_client_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/repository_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/ssh_auth_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/submodule_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycert.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycert2.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycert3.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/certs/gitalycertdup.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/gitalycert.pem %%DATADIR%%/ruby/spec/lib/gitlab/git/user_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/wiki_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/worktree_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/ref_matcher_spec.rb %%DATADIR%%/ruby/spec/spec_helper.rb %%DATADIR%%/ruby/spec/support/generate-seed-repo-rb %%DATADIR%%/ruby/spec/support/helpers/certs/gitalycert.pem %%DATADIR%%/ruby/spec/support/helpers/certs/gitalykey.pem %%DATADIR%%/ruby/spec/support/helpers/gitlab_shell_helper.rb %%DATADIR%%/ruby/spec/support/helpers/integration_helper.rb %%DATADIR%%/ruby/spec/support/helpers/seed_repo.rb %%DATADIR%%/ruby/spec/support/sentry.rb %%DATADIR%%/ruby/spec/test_repo_helper.rb @(,,555) %%DATADIR%%/ruby/git-hooks/gitlab-shell-hook @(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/post-receive @(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/pre-receive @(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/update @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-debug +@(,,555) %%DATADIR%%/bin/gitaly-hooks @(,,555) %%DATADIR%%/bin/gitaly-ssh @(,,555) %%DATADIR%%/bin/gitaly-wrapper @(,,555) %%DATADIR%%/bin/praefect @sample %%DATADIR%%/config.toml.sample Index: branches/2019Q4 =================================================================== --- branches/2019Q4 (revision 516425) +++ branches/2019Q4 (revision 516426) Property changes on: branches/2019Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r515487