diff --git a/Gemfile b/Gemfile index 77864b7b4c113c687a3c2d822ead92f1e246d4bb..3b59ba311d01bb7761e0a65363dcad185454f775 100644 --- a/Gemfile +++ b/Gemfile @@ -630,7 +630,7 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 17.4.0.pre.rc1', feature_category: :gitaly +gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions gem 'gitlab-kas-grpc', '~> 17.4.0.pre.rc1', feature_category: :deployment_management diff --git a/Gemfile.checksum b/Gemfile.checksum index baa31684649c7cdfc6e86be1048ea5027a85a22e..b78f8d0bc91f0a6c53ecfa3d9a65f89bc9060c20 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -218,7 +218,7 @@ {"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"}, {"name":"gettext_i18n_rails","version":"1.13.0","platform":"ruby","checksum":"d4a4739d928b6ce52a2d694d33a831dcb06c7c8e197b3172fc73dfaa20ac8ee6"}, {"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"}, -{"name":"gitaly","version":"17.4.0.pre.rc1","platform":"ruby","checksum":"72c69dfa77871be78dd2e017be3131b9515b396d779df5785f77df291219f7b3"}, +{"name":"gitaly","version":"17.5.0.pre.rc42","platform":"ruby","checksum":"15469230245c5d83f09c6e057ae1088ce87133ff156086bf02a2b8b2ec24e817"}, {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"}, {"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"}, {"name":"gitlab-dangerfiles","version":"4.8.0","platform":"ruby","checksum":"b327d079552ec974a63bf34d749a0308425af6ebf51d01064f1a6ff216a523db"}, diff --git a/Gemfile.lock b/Gemfile.lock index 4926df4f551fc31b77d27cc6f6d9c434468e937e..02bc75c8554a5e876d51e3acf5f92ac094b7c5c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -714,7 +714,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (17.4.0.pre.rc1) + gitaly (17.5.0.pre.rc42) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -2061,7 +2061,7 @@ DEPENDENCIES gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.13.0) - gitaly (~> 17.4.0.pre.rc1) + gitaly (~> 17.5.0.pre.rc1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.8.0) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index edacf72fd6debd327a1ad77e1ba61eb0761fcd8e..3f47b0cc6ebd4875a2d17cebf7f7fe439b84d2c9 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -2,18 +2,18 @@ {"name":"CFPropertyList","version":"3.0.5","platform":"ruby","checksum":"a78551cd4768d78ebca98488c27e33652ef818be64697a54676d34e6434674a4"}, {"name":"RedCloth","version":"4.3.4","platform":"ruby","checksum":"5231b2fdd91a933915cba330e5fd1a74025e77b56f57b7404c7191ebf2812297"}, {"name":"acme-client","version":"2.0.18","platform":"ruby","checksum":"3feab341926ffc16eb65babe51ba4dad8180c13e21e774871344e0b3502ef275"}, -{"name":"actioncable","version":"7.1.4","platform":"ruby","checksum":"8443dfe12129cf6d7c93b16a5f0be83bf0d3f686875d7ff5e1110c884c3e8fbc"}, -{"name":"actionmailbox","version":"7.1.4","platform":"ruby","checksum":"30be3b404290ef19c477aab19ee48cbcb6b409cc3f377f732c7b907998e6f36f"}, -{"name":"actionmailer","version":"7.1.4","platform":"ruby","checksum":"eae396a3f2de43c54f1d267ecc2e4593a0122f20e321dbee5c96ffcbbdfa4b25"}, -{"name":"actionpack","version":"7.1.4","platform":"ruby","checksum":"f5f8879debbf0b1a73dcc60f91c975b7bed7ff87c873b5fa794acaa1f3b7e230"}, -{"name":"actiontext","version":"7.1.4","platform":"ruby","checksum":"5d07bfe0d50cec80f55f71526aa67bbcc401f0ea6dcb611687119294b0da9b92"}, -{"name":"actionview","version":"7.1.4","platform":"ruby","checksum":"c02bf0665edbfaf1616b41aad0ce8919820005226d4e78e56a998b6b32593953"}, -{"name":"activejob","version":"7.1.4","platform":"ruby","checksum":"65f65a552aeb33f444fb57b9dc75ecc01693ef13ae410591c7a5f7763c3c0bf6"}, -{"name":"activemodel","version":"7.1.4","platform":"ruby","checksum":"188d055afdd07d2f037d23403c939618ea0d7fa518a7de1b76324c2876d410b6"}, -{"name":"activerecord","version":"7.1.4","platform":"ruby","checksum":"836d6dac137ec5bb71e7ab943f6eca97917c8a2968fa466b38920f4812642cdd"}, +{"name":"actioncable","version":"7.1.4.1","platform":"ruby","checksum":"9d03c105ca7d088c2d3814a6c6c33e83efe31c0c4ac80ff3cd97773e4d2fcbd5"}, +{"name":"actionmailbox","version":"7.1.4.1","platform":"ruby","checksum":"53d23141bf650d2b810617b9fb44edea83f9e292fd4949fcff675646309325fd"}, +{"name":"actionmailer","version":"7.1.4.1","platform":"ruby","checksum":"d977b4acd66dea2e86c5c1691609ae8ab388d87e6ba1ea962119e80fae7369c0"}, +{"name":"actionpack","version":"7.1.4.1","platform":"ruby","checksum":"5d3b2ef4bdad04970c7351b8f4c8428a2d443260d90d7b1ec316475328562dd7"}, +{"name":"actiontext","version":"7.1.4.1","platform":"ruby","checksum":"0d9c7e17a4c0a03feb56252db340c969aa070e2ed622ccc386e06f4b15065f19"}, +{"name":"actionview","version":"7.1.4.1","platform":"ruby","checksum":"522c3153435a17c1757e61698746e9100328665a02ea9b33694f9b69fab9f90b"}, +{"name":"activejob","version":"7.1.4.1","platform":"ruby","checksum":"d437d262964f9e9d1164caae9032f2f722b6640f55ce60de9a7c459d251911e4"}, +{"name":"activemodel","version":"7.1.4.1","platform":"ruby","checksum":"f48237b40183f3629e4b98ae962edc4c2faa228fe2927268e14e7f318272edb6"}, +{"name":"activerecord","version":"7.1.4.1","platform":"ruby","checksum":"c14d6a345a422b65dcd9000e47ae90042da6a857a7022641855ad0758f029db3"}, {"name":"activerecord-explain-analyze","version":"0.1.0","platform":"ruby","checksum":"5debb11fe23f35b91953a80677d80ba9284ee737fd9d148c1d7603ce45217f7b"}, -{"name":"activestorage","version":"7.1.4","platform":"ruby","checksum":"23ebbb59fb9563f035ffa18d30b6bbc3a5d3f5cda004d19765f594db24f70b46"}, -{"name":"activesupport","version":"7.1.4","platform":"ruby","checksum":"3a8e1a7ce5541ab2ffefaa390c40c89d7f54273dc671ed429614953cffd8a232"}, +{"name":"activestorage","version":"7.1.4.1","platform":"ruby","checksum":"c82a6ba87582f3e6c2cf70bc7e0fa49ccbcec0bccf5aef246ae3a9615126fc1f"}, +{"name":"activesupport","version":"7.1.4.1","platform":"ruby","checksum":"80e3739389ec469d3f768386b10107e9ab7ec45d308c439d6f51b3c3f731615c"}, {"name":"addressable","version":"2.8.7","platform":"ruby","checksum":"462986537cf3735ab5f3c0f557f14155d778f4b43ea4f485a9deb9c8f7c58232"}, {"name":"aes_key_wrap","version":"1.1.0","platform":"ruby","checksum":"b935f4756b37375895db45669e79dfcdc0f7901e12d4e08974d5540c8e0776a5"}, {"name":"akismet","version":"3.0.0","platform":"ruby","checksum":"74991b8e3d3257eeea996b47069abb8da2006c84a144255123e8dffd1c86b230"}, @@ -219,7 +219,7 @@ {"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"}, {"name":"gettext_i18n_rails","version":"1.13.0","platform":"ruby","checksum":"d4a4739d928b6ce52a2d694d33a831dcb06c7c8e197b3172fc73dfaa20ac8ee6"}, {"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"}, -{"name":"gitaly","version":"17.4.0.pre.rc1","platform":"ruby","checksum":"72c69dfa77871be78dd2e017be3131b9515b396d779df5785f77df291219f7b3"}, +{"name":"gitaly","version":"17.5.0.pre.rc42","platform":"ruby","checksum":"15469230245c5d83f09c6e057ae1088ce87133ff156086bf02a2b8b2ec24e817"}, {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"}, {"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"}, {"name":"gitlab-dangerfiles","version":"4.8.0","platform":"ruby","checksum":"b327d079552ec974a63bf34d749a0308425af6ebf51d01064f1a6ff216a523db"}, @@ -552,12 +552,12 @@ {"name":"rack-test","version":"2.1.0","platform":"ruby","checksum":"0c61fc61904049d691922ea4bb99e28004ed3f43aa5cfd495024cc345f125dfb"}, {"name":"rack-timeout","version":"0.7.0","platform":"ruby","checksum":"757337e9793cca999bb73a61fe2a7d4280aa9eefbaf787ce3b98d860749c87d9"}, {"name":"rackup","version":"1.0.0","platform":"ruby","checksum":"e95e3e1b7f1f54ac3730fa9f1024903cb23e424a901781198d492d32c60079f1"}, -{"name":"rails","version":"7.1.4","platform":"ruby","checksum":"dfcf9e78d26db70320b99958e7ee8957db9cee5969279d449b925cdab18cc51e"}, +{"name":"rails","version":"7.1.4.1","platform":"ruby","checksum":"4a9e8955c812c930f074e083375b99860989f61da47a0734b7abf9d0baaa4739"}, {"name":"rails-controller-testing","version":"1.0.5","platform":"ruby","checksum":"741448db59366073e86fc965ba403f881c636b79a2c39a48d0486f2607182e94"}, {"name":"rails-dom-testing","version":"2.2.0","platform":"ruby","checksum":"e515712e48df1f687a1d7c380fd7b07b8558faa26464474da64183a7426fa93b"}, {"name":"rails-html-sanitizer","version":"1.6.0","platform":"ruby","checksum":"86e9f19d2e6748890dcc2633c8945ca45baa08a1df9d8c215ce17b3b0afaa4de"}, {"name":"rails-i18n","version":"7.0.9","platform":"ruby","checksum":"c184db80a7c7bf21c14e0e400fe9e27c4c20312f019aaff5b364a82858dc1369"}, -{"name":"railties","version":"7.1.4","platform":"ruby","checksum":"54395f2753366699e54417aea67d8b3c0eefd994de2f4152d364a400de634a5a"}, +{"name":"railties","version":"7.1.4.1","platform":"ruby","checksum":"5d8073d489f9d8394f02b2cfe68583d22d2dac3ce395a5c72dbf7548e385f17a"}, {"name":"rainbow","version":"3.1.1","platform":"ruby","checksum":"039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a"}, {"name":"rake","version":"13.0.6","platform":"ruby","checksum":"5ce4bf5037b4196c24ac62834d8db1ce175470391026bd9e557d669beeb19097"}, {"name":"rb-fsevent","version":"0.11.2","platform":"ruby","checksum":"43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 05bdda4ae103f4b7e71427352e78916bd8755d2b..b8742990a6a2787deec5eb44b53ca2cc2f8173c0 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -230,35 +230,35 @@ GEM acme-client (2.0.18) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - actioncable (7.1.4) - actionpack (= 7.1.4) - activesupport (= 7.1.4) + actioncable (7.1.4.1) + actionpack (= 7.1.4.1) + activesupport (= 7.1.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.4) - actionpack (= 7.1.4) - activejob (= 7.1.4) - activerecord (= 7.1.4) - activestorage (= 7.1.4) - activesupport (= 7.1.4) + actionmailbox (7.1.4.1) + actionpack (= 7.1.4.1) + activejob (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.4) - actionpack (= 7.1.4) - actionview (= 7.1.4) - activejob (= 7.1.4) - activesupport (= 7.1.4) + actionmailer (7.1.4.1) + actionpack (= 7.1.4.1) + actionview (= 7.1.4.1) + activejob (= 7.1.4.1) + activesupport (= 7.1.4.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.4) - actionview (= 7.1.4) - activesupport (= 7.1.4) + actionpack (7.1.4.1) + actionview (= 7.1.4.1) + activesupport (= 7.1.4.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -266,38 +266,38 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.4) - actionpack (= 7.1.4) - activerecord (= 7.1.4) - activestorage (= 7.1.4) - activesupport (= 7.1.4) + actiontext (7.1.4.1) + actionpack (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.4) - activesupport (= 7.1.4) + actionview (7.1.4.1) + activesupport (= 7.1.4.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.4) - activesupport (= 7.1.4) + activejob (7.1.4.1) + activesupport (= 7.1.4.1) globalid (>= 0.3.6) - activemodel (7.1.4) - activesupport (= 7.1.4) - activerecord (7.1.4) - activemodel (= 7.1.4) - activesupport (= 7.1.4) + activemodel (7.1.4.1) + activesupport (= 7.1.4.1) + activerecord (7.1.4.1) + activemodel (= 7.1.4.1) + activesupport (= 7.1.4.1) timeout (>= 0.4.0) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.1.4) - actionpack (= 7.1.4) - activejob (= 7.1.4) - activerecord (= 7.1.4) - activesupport (= 7.1.4) + activestorage (7.1.4.1) + actionpack (= 7.1.4.1) + activejob (= 7.1.4.1) + activerecord (= 7.1.4.1) + activesupport (= 7.1.4.1) marcel (~> 1.0) - activesupport (7.1.4) + activesupport (7.1.4.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -724,7 +724,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (17.4.0.pre.rc1) + gitaly (17.5.0.pre.rc42) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -1499,20 +1499,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.4) - actioncable (= 7.1.4) - actionmailbox (= 7.1.4) - actionmailer (= 7.1.4) - actionpack (= 7.1.4) - actiontext (= 7.1.4) - actionview (= 7.1.4) - activejob (= 7.1.4) - activemodel (= 7.1.4) - activerecord (= 7.1.4) - activestorage (= 7.1.4) - activesupport (= 7.1.4) + rails (7.1.4.1) + actioncable (= 7.1.4.1) + actionmailbox (= 7.1.4.1) + actionmailer (= 7.1.4.1) + actionpack (= 7.1.4.1) + actiontext (= 7.1.4.1) + actionview (= 7.1.4.1) + activejob (= 7.1.4.1) + activemodel (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) bundler (>= 1.15.0) - railties (= 7.1.4) + railties (= 7.1.4.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1527,9 +1527,9 @@ GEM rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.4) - actionpack (= 7.1.4) - activesupport (= 7.1.4) + railties (7.1.4.1) + actionpack (= 7.1.4.1) + activesupport (= 7.1.4.1) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -2088,7 +2088,7 @@ DEPENDENCIES gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.13.0) - gitaly (~> 17.4.0.pre.rc1) + gitaly (~> 17.5.0.pre.rc1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.8.0)