diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 1ace95a2ecd21b632a1bcef0891e90baacf7909c..adfc4305213bd78541854fe4b33cae8ac71cc107 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -7bfa2d0279bc80167394292d95824ae22545a79c +50488bee76f467b316e653883b427d3072298de0 diff --git a/Gemfile b/Gemfile index 3bcefbbc1a7664b08d250f0bf43c28f8ef5e8b0c..f1b14631b4dd7ccca4d8b0544861c90975670fbe 100644 --- a/Gemfile +++ b/Gemfile @@ -642,7 +642,7 @@ gem 'ssh_data', '~> 2.0', feature_category: :shared gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly +gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management diff --git a/Gemfile.checksum b/Gemfile.checksum index 7c2db7f440ae0e4e19a722670055a0c3426bbd41..587aee306c1ef652fbb1b0d72f8c5fbed8ba9821 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -217,7 +217,7 @@ {"name":"gettext","version":"3.5.1","platform":"ruby","checksum":"03ec7f71ea7e2cf1fdcd5e08682e98b81601922fdbee890b7bc6f63b0e1a512a"}, {"name":"gettext_i18n_rails","version":"1.13.0","platform":"ruby","checksum":"d4a4739d928b6ce52a2d694d33a831dcb06c7c8e197b3172fc73dfaa20ac8ee6"}, {"name":"git","version":"1.19.1","platform":"ruby","checksum":"b0a422d9f6517353c48a330d6114de4db9e0c82dbe7202964a1d9f1fbc827d70"}, -{"name":"gitaly","version":"18.4.1","platform":"ruby","checksum":"c355521f967a5d48d61ab343bacd12af95ce6be98c9fc3253ce6ec01029be3e1"}, +{"name":"gitaly","version":"18.6.0.pre.rc1","platform":"ruby","checksum":"cc2b20edd2d7a9888e99c09b8fd862455ff4bed0e3c40fffd073fe33ef21c376"}, {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"}, {"name":"gitlab-chronic","version":"0.10.6","platform":"ruby","checksum":"a244d11a1396d2aac6ae9b2f326adf1605ec1ad20c29f06e8b672047d415a9ac"}, {"name":"gitlab-cloud-connector","version":"1.33.0","platform":"ruby","checksum":"bc9ebba1728d7283b35185ea1b7358370dfe0ce1fc51e388955ab0ed05db722f"}, diff --git a/Gemfile.lock b/Gemfile.lock index c5a8006895f9e264fe69ddafb0b3c544cf067984..09cf059a55a14a7ea929670e404b286f7ea97f45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -740,7 +740,7 @@ GEM git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (18.4.1) + gitaly (18.6.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -2176,7 +2176,7 @@ DEPENDENCIES gettext (~> 3.5, >= 3.5.1) gettext_i18n_rails (~> 1.13.0) git (~> 1.8) - gitaly (~> 18.4.0.pre.rc1) + gitaly (~> 18.6.0.pre.rc1) gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index 5ba54d624ca1a34bbb9d904f386c4d51cd474a3e..09a5f5bc7657f4e3bbe9351fbde205484293fccb 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -217,7 +217,7 @@ {"name":"gettext","version":"3.5.1","platform":"ruby","checksum":"03ec7f71ea7e2cf1fdcd5e08682e98b81601922fdbee890b7bc6f63b0e1a512a"}, {"name":"gettext_i18n_rails","version":"1.13.0","platform":"ruby","checksum":"d4a4739d928b6ce52a2d694d33a831dcb06c7c8e197b3172fc73dfaa20ac8ee6"}, {"name":"git","version":"1.19.1","platform":"ruby","checksum":"b0a422d9f6517353c48a330d6114de4db9e0c82dbe7202964a1d9f1fbc827d70"}, -{"name":"gitaly","version":"18.4.1","platform":"ruby","checksum":"c355521f967a5d48d61ab343bacd12af95ce6be98c9fc3253ce6ec01029be3e1"}, +{"name":"gitaly","version":"18.6.0.pre.rc1","platform":"ruby","checksum":"cc2b20edd2d7a9888e99c09b8fd862455ff4bed0e3c40fffd073fe33ef21c376"}, {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"}, {"name":"gitlab-chronic","version":"0.10.6","platform":"ruby","checksum":"a244d11a1396d2aac6ae9b2f326adf1605ec1ad20c29f06e8b672047d415a9ac"}, {"name":"gitlab-cloud-connector","version":"1.33.0","platform":"ruby","checksum":"bc9ebba1728d7283b35185ea1b7358370dfe0ce1fc51e388955ab0ed05db722f"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 9b64c52fae8ee9b5a78ae914cf6bb378a6218e4c..dd864e5cd62d17d57e9ef05337398e4712a6b88e 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -734,7 +734,7 @@ GEM git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (18.4.1) + gitaly (18.6.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -2171,7 +2171,7 @@ DEPENDENCIES gettext (~> 3.5, >= 3.5.1) gettext_i18n_rails (~> 1.13.0) git (~> 1.8) - gitaly (~> 18.4.0.pre.rc1) + gitaly (~> 18.6.0.pre.rc1) gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) diff --git a/lib/gitlab/git/changed_path.rb b/lib/gitlab/git/changed_path.rb index 96aac3859640c659ec82f2881ae34cd6fac4c639..3acb0f3e0481de137a45e0b60ed3f19b3656395c 100644 --- a/lib/gitlab/git/changed_path.rb +++ b/lib/gitlab/git/changed_path.rb @@ -3,9 +3,11 @@ module Gitlab module Git class ChangedPath - attr_reader :status, :path, :old_mode, :new_mode, :new_blob_id, :old_blob_id, :old_path + attr_reader :status, :path, :old_mode, :new_mode, :new_blob_id, :old_blob_id, :old_path, :commit_id - def initialize(status:, path:, old_mode:, new_mode:, new_blob_id: nil, old_blob_id: nil, old_path: nil) + def initialize( + status:, path:, old_mode:, new_mode:, new_blob_id: nil, old_blob_id: nil, old_path: nil, + commit_id: nil) @status = status @path = path @old_mode = old_mode @@ -13,6 +15,7 @@ def initialize(status:, path:, old_mode:, new_mode:, new_blob_id: nil, old_blob_ @old_blob_id = old_blob_id @new_blob_id = new_blob_id @old_path = old_path.presence || @path + @commit_id = commit_id end def new_file? diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb index be44a80e984b74df94afab1485dd041ebdbc7a50..d980bf64ee55e082dd064a72a89b3602989111a0 100644 --- a/lib/gitlab/gitaly_client/commit_service.rb +++ b/lib/gitlab/gitaly_client/commit_service.rb @@ -266,7 +266,8 @@ def find_changed_paths(objects, merge_commit_diff_mode: nil, find_renames: false old_mode: path.old_mode.to_s(8), new_mode: path.new_mode.to_s(8), old_blob_id: path.old_blob_id, - new_blob_id: path.new_blob_id + new_blob_id: path.new_blob_id, + commit_id: path.commit_id ) end end diff --git a/spec/lib/gitlab/git/changed_path_spec.rb b/spec/lib/gitlab/git/changed_path_spec.rb index 6b906e404b23e02fa6bba38858c6d20e64554556..4522ed64d49be3bde983442d1d31c2487e87c9cc 100644 --- a/spec/lib/gitlab/git/changed_path_spec.rb +++ b/spec/lib/gitlab/git/changed_path_spec.rb @@ -10,7 +10,8 @@ old_mode: old_mode, new_mode: new_mode, old_blob_id: old_blob_id, - new_blob_id: new_blob_id + new_blob_id: new_blob_id, + commit_id: commit_id ) end @@ -20,6 +21,7 @@ let(:new_mode) { '100644' } let(:old_blob_id) { '0000000000000000000000000000000000000000' } let(:new_blob_id) { '645f6c4c82fd3f5e06f67134450a570b795e55a6' } + let(:commit_id) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' } describe '#new_file?' do subject(:new_file?) { changed_path.new_file? } diff --git a/spec/lib/gitlab/git/push_spec.rb b/spec/lib/gitlab/git/push_spec.rb index d8c3798a46e7417d8e1ebc8cc5f49b85fe1bb09e..dfe12af06fbb6523f051ae291cc8d397071057e8 100644 --- a/spec/lib/gitlab/git/push_spec.rb +++ b/spec/lib/gitlab/git/push_spec.rb @@ -157,7 +157,8 @@ old_mode: "0", old_path: "bar/branch-test.txt", path: "bar/branch-test.txt", - status: :ADDED + status: :ADDED, + commit_id: "" ), Gitlab::Git::ChangedPath.new( new_blob_id: "85bc2f9753afd5f4fc5d7c75f74f8d526f26b4f3", @@ -166,7 +167,8 @@ old_mode: "0", old_path: "files/js/commit.coffee", path: "files/js/commit.coffee", - status: :ADDED + status: :ADDED, + commit_id: "" ), Gitlab::Git::ChangedPath.new( new_blob_id: "0000000000000000000000000000000000000000", @@ -175,7 +177,8 @@ old_mode: "100644", old_path: "files/js/commit.js.coffee", path: "files/js/commit.js.coffee", - status: :DELETED + status: :DELETED, + commit_id: "" ), Gitlab::Git::ChangedPath.new( new_blob_id: "8c3014aceae45386c3c026a7ea4a1f68660d51d6", @@ -184,7 +187,8 @@ old_mode: "0", old_path: "with space/README.md", path: "with space/README.md", - status: :ADDED + status: :ADDED, + commit_id: "" )].as_json end end diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index f1c9706a4444839af909a8e16ef42001e80da5a2..b3aa38bba0e5b594b47326e8424403a7c664f8d5 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -1839,7 +1839,8 @@ def create_commit(blobs) [ Gitlab::Git::ChangedPath.new( status: :ADDED, path: "files/executables/ls", old_path: '', old_mode: "0", new_mode: "100755", - old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: 'c84acd1ff0b844201312052f9bb3b7259eb2e177' + old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: 'c84acd1ff0b844201312052f9bb3b7259eb2e177', + commit_id: '6b8dc4a827797aa025ff6b8f425e583858a10d4f' ) ] end @@ -1848,7 +1849,8 @@ def create_commit(blobs) [ Gitlab::Git::ChangedPath.new( status: :ADDED, path: "bar/branch-test.txt", old_path: '', old_mode: "0", new_mode: "100644", - old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: '93e123ac8a3e6a0b600953d7598af629dec7b735' + old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: '93e123ac8a3e6a0b600953d7598af629dec7b735', + commit_id: 'b83d6e391c22777fca1ed3012fce84f633d7fed0' ) ] end @@ -1857,11 +1859,13 @@ def create_commit(blobs) [ Gitlab::Git::ChangedPath.new( status: :MODIFIED, path: ".gitmodules", old_path: '', old_mode: "100644", new_mode: "100644", - old_blob_id: 'fdaada1754989978413d618ee1fb1c0469d6a664', new_blob_id: '0792c58905eff3432b721f8c4a64363d8e28d9ae' + old_blob_id: 'fdaada1754989978413d618ee1fb1c0469d6a664', new_blob_id: '0792c58905eff3432b721f8c4a64363d8e28d9ae', + commit_id: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9' ), Gitlab::Git::ChangedPath.new( status: :ADDED, path: "gitlab-shell", old_path: '', old_mode: "0", new_mode: "160000", - old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: '79bceae69cb5750d6567b223597999bfa91cb3b9' + old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: '79bceae69cb5750d6567b223597999bfa91cb3b9', + commit_id: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9' ) ] end @@ -1870,15 +1874,18 @@ def create_commit(blobs) [ Gitlab::Git::ChangedPath.new( status: :ADDED, path: ".gitignore", old_path: '', old_mode: "0", new_mode: "100644", - old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: '470ad2fcf1e33798f1afc5781d08e60c40f51e7a' + old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: '470ad2fcf1e33798f1afc5781d08e60c40f51e7a', + commit_id: '1a0b36b3cdad1d2ee32457c102a8c0b7056fa863' ), Gitlab::Git::ChangedPath.new( status: :ADDED, path: "LICENSE", old_path: '', old_mode: "0", new_mode: "100644", - old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: '50b27c6518be44c42c4d87966ae2481ce895624c' + old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: '50b27c6518be44c42c4d87966ae2481ce895624c', + commit_id: '1a0b36b3cdad1d2ee32457c102a8c0b7056fa863' ), Gitlab::Git::ChangedPath.new( status: :ADDED, path: "README.md", old_path: '', old_mode: "0", new_mode: "100644", - old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: 'faaf198af3a36dbf41961466703cc1d47c61d051' + old_blob_id: '0000000000000000000000000000000000000000', new_blob_id: 'faaf198af3a36dbf41961466703cc1d47c61d051', + commit_id: '1a0b36b3cdad1d2ee32457c102a8c0b7056fa863' ) ] end diff --git a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb index 1d6b0a003fa687d0448dc83574ad9c661aaa30e4..9323e97debc9dd5199cbf258be24c5d40d9dfebb 100644 --- a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb +++ b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb @@ -207,47 +207,56 @@ { path: 'files/locked/foo.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/foo.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391" + new_blob_id: "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", + commit_id: "ade1c0b4b116209ed2a9958436b26f89085ec383" }, { path: 'files/locked/foo.lfs', status: 'MODIFIED', old_mode: '100644', new_mode: '100644', old_path: 'files/locked/foo.lfs', old_blob_id: "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", - new_blob_id: "3eac02ca74e5b8e5df01dbdfdd7a9905c5e12007" + new_blob_id: "3eac02ca74e5b8e5df01dbdfdd7a9905c5e12007", + commit_id: "594937c22df7a093888ff13af518f2b683f5f719" }, { path: 'files/locked/bar.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/bar.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1" + new_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1", + commit_id: "760c58db5a6f3b64ad7e3ff6b3c4a009da7d9b33" }, { path: 'files/locked/foo.lfs', status: 'MODIFIED', old_mode: '100644', new_mode: '100644', old_path: 'files/locked/foo.lfs', old_blob_id: "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", - new_blob_id: "3eac02ca74e5b8e5df01dbdfdd7a9905c5e12007" + new_blob_id: "3eac02ca74e5b8e5df01dbdfdd7a9905c5e12007", + commit_id: "2b298117a741cdb06eb48df2c33f1390cf89f7e8" }, { path: 'files/locked/bar.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/bar.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1" + new_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1", + commit_id: "2b298117a741cdb06eb48df2c33f1390cf89f7e8" }, { path: 'files/locked/bar.lfs', status: 'MODIFIED', old_mode: '100644', new_mode: '100644', old_path: 'files/locked/bar.lfs', old_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1", - new_blob_id: "9d8e9599c93013dee199bfdc13e8365c11652bba" + new_blob_id: "9d8e9599c93013dee199bfdc13e8365c11652bba", + commit_id: "c41e12c387b4e0e41bfc17208252d6a6430f2fcd" }, { path: 'files/locked/bar.lfs', status: 'MODIFIED', old_mode: '100644', new_mode: '100644', old_path: 'files/locked/bar.lfs', old_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1", - new_blob_id: "9d8e9599c93013dee199bfdc13e8365c11652bba" + new_blob_id: "9d8e9599c93013dee199bfdc13e8365c11652bba", + commit_id: "1ada92f78a19f27cb442a0a205f1c451a3a15432" }, { path: 'files/locked/baz.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/baz.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "dd1a523861a19addf2cce888119a07560be334b9" + new_blob_id: "dd1a523861a19addf2cce888119a07560be334b9", + commit_id: "1ada92f78a19f27cb442a0a205f1c451a3a15432" }, { path: 'files/locked/baz.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/baz.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "dd1a523861a19addf2cce888119a07560be334b9" + new_blob_id: "dd1a523861a19addf2cce888119a07560be334b9", + commit_id: "1ada92f78a19f27cb442a0a205f1c451a3a15432" } ].as_json end @@ -263,32 +272,38 @@ { path: 'files/locked/foo.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/foo.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391" + new_blob_id: "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", + commit_id: "ade1c0b4b116209ed2a9958436b26f89085ec383" }, { path: 'files/locked/foo.lfs', status: 'MODIFIED', old_mode: '100644', new_mode: '100644', old_path: 'files/locked/foo.lfs', old_blob_id: "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", - new_blob_id: "3eac02ca74e5b8e5df01dbdfdd7a9905c5e12007" + new_blob_id: "3eac02ca74e5b8e5df01dbdfdd7a9905c5e12007", + commit_id: "594937c22df7a093888ff13af518f2b683f5f719" }, { path: 'files/locked/bar.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/bar.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1" + new_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1", + commit_id: "760c58db5a6f3b64ad7e3ff6b3c4a009da7d9b33" }, { path: 'files/locked/bar.lfs', status: 'MODIFIED', old_mode: '100644', new_mode: '100644', old_path: 'files/locked/bar.lfs', old_blob_id: "ea6c0a2142103f2d9157c1a9d50cc708032ec4a1", - new_blob_id: "9d8e9599c93013dee199bfdc13e8365c11652bba" + new_blob_id: "9d8e9599c93013dee199bfdc13e8365c11652bba", + commit_id: "760c58db5a6f3b64ad7e3ff6b3c4a009da7d9b33" }, { path: 'files/locked/baz.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/baz.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "dd1a523861a19addf2cce888119a07560be334b9" + new_blob_id: "dd1a523861a19addf2cce888119a07560be334b9", + commit_id: "1ada92f78a19f27cb442a0a205f1c451a3a15432" }, { path: 'files/locked/baz.lfs', status: 'ADDED', old_mode: '0', new_mode: '100644', old_path: 'files/locked/baz.lfs', old_blob_id: "0000000000000000000000000000000000000000", - new_blob_id: "dd1a523861a19addf2cce888119a07560be334b9" + new_blob_id: "dd1a523861a19addf2cce888119a07560be334b9", + commit_id: "1ada92f78a19f27cb442a0a205f1c451a3a15432" } ].as_json end @@ -374,7 +389,8 @@ "old_mode" => "100644", "old_path" => "CHANGELOG", "path" => "CHANGELOG.md", - "status" => "RENAMED" + "status" => "RENAMED", + "commit_id" => "94bb47ca1297b7b3731ff2a36923640991e9236f" } ] @@ -394,7 +410,8 @@ "old_mode" => "100644", "old_path" => "CHANGELOG", "path" => "CHANGELOG", - "status" => "DELETED" + "status" => "DELETED", + "commit_id" => "94bb47ca1297b7b3731ff2a36923640991e9236f" }, { "new_blob_id" => "53855584db773c3df5b5f61f72974cb298822fbb", @@ -403,7 +420,8 @@ "old_mode" => "0", "old_path" => "CHANGELOG.md", "path" => "CHANGELOG.md", - "status" => "ADDED" + "status" => "ADDED", + "commit_id" => "94bb47ca1297b7b3731ff2a36923640991e9236f" } ] diff --git a/spec/models/ci/external_pull_request_spec.rb b/spec/models/ci/external_pull_request_spec.rb index f15a0b71be83c8bd4e3446c0e8b00066d48d14e9..c6afddd8fb1b24e83deb005866fb4c584a497998 100644 --- a/spec/models/ci/external_pull_request_spec.rb +++ b/spec/models/ci/external_pull_request_spec.rb @@ -249,7 +249,8 @@ old_mode: "0", old_path: "bar/branch-test.txt", path: "bar/branch-test.txt", - status: :ADDED + status: :ADDED, + commit_id: "" ), Gitlab::Git::ChangedPath.new( new_blob_id: "85bc2f9753afd5f4fc5d7c75f74f8d526f26b4f3", @@ -258,7 +259,8 @@ old_mode: "0", old_path: "files/js/commit.coffee", path: "files/js/commit.coffee", - status: :ADDED + status: :ADDED, + commit_id: "" ), Gitlab::Git::ChangedPath.new( new_blob_id: "0000000000000000000000000000000000000000", @@ -267,7 +269,8 @@ old_mode: "100644", old_path: "files/js/commit.js.coffee", path: "files/js/commit.js.coffee", - status: :DELETED + status: :DELETED, + commit_id: "" ), Gitlab::Git::ChangedPath.new( new_blob_id: "8c3014aceae45386c3c026a7ea4a1f68660d51d6", @@ -276,7 +279,8 @@ old_mode: "0", old_path: "with space/README.md", path: "with space/README.md", - status: :ADDED + status: :ADDED, + commit_id: "" ) ].as_json end