diff --git a/.gitlab/ci/gitlab-gems.gitlab-ci.yml b/.gitlab/ci/gitlab-gems.gitlab-ci.yml index f5b0b9fbe26..a4596ee16c0 100644 --- a/.gitlab/ci/gitlab-gems.gitlab-ci.yml +++ b/.gitlab/ci/gitlab-gems.gitlab-ci.yml @@ -44,9 +44,6 @@ include: - local: .gitlab/ci/templates/gem.gitlab-ci.yml inputs: gem_name: "gitlab-housekeeper" - - local: .gitlab/ci/templates/gem.gitlab-ci.yml - inputs: - gem_name: "openbao_client" - local: .gitlab/ci/templates/gem.gitlab-ci.yml inputs: gem_name: "gitlab-active-context" diff --git a/Gemfile b/Gemfile index 59f1f96a85c..1e5103b9476 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,6 @@ gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared gem 'openssl', '~> 3.0', feature_category: :shared -gem 'ipaddr', '~> 1.2.5', feature_category: :shared gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared @@ -758,8 +757,6 @@ gem 'duo_api', '~> 1.3', feature_category: :system_access gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation -gem 'openbao_client', path: 'gems/openbao_client', feature_category: :artifact_security - gem 'paper_trail', '~> 15.0', feature_category: :shared gem "i18n_data", "~> 0.13.1", feature_category: :system_access diff --git a/Gemfile.checksum b/Gemfile.checksum index 60982ddaa46..0c2f309874d 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -341,7 +341,6 @@ {"name":"influxdb-client","version":"3.2.0","platform":"ruby","checksum":"dc1e8ec80542f64c9f31af6d9bfa4c147474bf32b9179a7f0cab970793b8e1f2"}, {"name":"invisible_captcha","version":"2.1.0","platform":"ruby","checksum":"02b452f3eb1b691d155ba3e8e97e1be0e6b6be62e8bc94957234b9cde0852b1e"}, {"name":"io-event","version":"1.6.5","platform":"ruby","checksum":"5da4c044ac5f411563da1a4743d28c8d30d7802e29370db42139a52b807b4ce2"}, -{"name":"ipaddr","version":"1.2.7","platform":"ruby","checksum":"cb7f4087fdbf14bcedc23ac471b8ac521648b3a5b4b5be3a4378066636e6af72"}, {"name":"ipaddress","version":"0.8.3","platform":"ruby","checksum":"85640c4f9194c26937afc8c78e3074a8e7c97d5d1210358d1440f01034d006f5"}, {"name":"jaeger-client","version":"1.1.0","platform":"ruby","checksum":"cb5e9b9bbee6ee8d6a82d03d947a5b04543d8c0a949c22e484254f18d8a458a8"}, {"name":"jaro_winkler","version":"1.5.6","platform":"java","checksum":"3262aea433861fec3179184e9adc1933cca8bc15665957a143b56816f1a22f74"}, diff --git a/Gemfile.lock b/Gemfile.lock index 8e04937b9b9..c593eeb8b90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,12 +123,6 @@ PATH diffy (~> 3.4) oj (~> 3.13.16) -PATH - remote: gems/openbao_client - specs: - openbao_client (1.0.0) - typhoeus (~> 1.0, >= 1.0.1) - PATH remote: vendor/gems/attr_encrypted specs: @@ -1030,7 +1024,6 @@ GEM invisible_captcha (2.1.0) rails (>= 5.2) io-event (1.6.5) - ipaddr (1.2.7) ipaddress (0.8.3) jaeger-client (1.1.0) opentracing (~> 0.3) @@ -2156,7 +2149,6 @@ DEPENDENCIES icalendar (~> 2.10.1) influxdb-client (~> 3.1) invisible_captcha (~> 2.1.0) - ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) ipynbdiff! jira-ruby (~> 2.3.0) @@ -2214,7 +2206,6 @@ DEPENDENCIES omniauth-shibboleth-redux (~> 2.0) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.8.0) - openbao_client! openid_connect (~> 2.3.0) openssl (~> 3.0) opentelemetry-exporter-otlp diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index da77eb94674..0e547cefc63 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -343,7 +343,6 @@ {"name":"io-console","version":"0.8.0","platform":"java","checksum":"3cc6fd5c66e587145c1fdf8dc40c2e3d851e90722a5d0cc3f38da352f06fe1bd"}, {"name":"io-console","version":"0.8.0","platform":"ruby","checksum":"cd6a9facbc69871d69b2cb8b926fc6ea7ef06f06e505e81a64f14a470fddefa2"}, {"name":"io-event","version":"1.6.5","platform":"ruby","checksum":"5da4c044ac5f411563da1a4743d28c8d30d7802e29370db42139a52b807b4ce2"}, -{"name":"ipaddr","version":"1.2.7","platform":"ruby","checksum":"cb7f4087fdbf14bcedc23ac471b8ac521648b3a5b4b5be3a4378066636e6af72"}, {"name":"ipaddress","version":"0.8.3","platform":"ruby","checksum":"85640c4f9194c26937afc8c78e3074a8e7c97d5d1210358d1440f01034d006f5"}, {"name":"irb","version":"1.14.3","platform":"ruby","checksum":"c457f1f2f1438ae9ce5c5be3981ae2138dec7fb894c7d73777eeeb0a6c0d0752"}, {"name":"jaeger-client","version":"1.1.0","platform":"ruby","checksum":"cb5e9b9bbee6ee8d6a82d03d947a5b04543d8c0a949c22e484254f18d8a458a8"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 575c0952334..fd55fcb78c7 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -123,12 +123,6 @@ PATH diffy (~> 3.4) oj (~> 3.13.16) -PATH - remote: gems/openbao_client - specs: - openbao_client (1.0.0) - typhoeus (~> 1.0, >= 1.0.1) - PATH remote: vendor/gems/attr_encrypted specs: @@ -1043,7 +1037,6 @@ GEM rails (>= 5.2) io-console (0.8.0) io-event (1.6.5) - ipaddr (1.2.7) ipaddress (0.8.3) irb (1.14.3) rdoc (>= 4.0.0) @@ -2187,7 +2180,6 @@ DEPENDENCIES icalendar (~> 2.10.1) influxdb-client (~> 3.1) invisible_captcha (~> 2.1.0) - ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) ipynbdiff! jira-ruby (~> 2.3.0) @@ -2245,7 +2237,6 @@ DEPENDENCIES omniauth-shibboleth-redux (~> 2.0) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.8.0) - openbao_client! openid_connect (~> 2.3.0) openssl (~> 3.0) opentelemetry-exporter-otlp diff --git a/app/assets/javascripts/notes/components/diff_with_note.vue b/app/assets/javascripts/notes/components/diff_with_note.vue index 0ea92366173..69ceb18bc69 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -71,6 +71,28 @@ export default { isFileDiscussion() { return this.positionType === FILE_DIFF_POSITION_TYPE; }, + showHeader() { + return ( + this.discussion.diff_file || this.discussion.original_position.position_type === 'file' + ); + }, + backfilledDiffFile() { + /* + * https://gitlab.com/gitlab-com/gl-infra/production/-/issues/19118 + * + * For the vast majority of cases, this should just be discussion.diff_file, + * but due to that defect, there are potentially some file discussions that cannot + * be rendered because there is no diff file attached + * + * This allows the header to display (sans file mode change) to roughly simulate + * having an actual diff file. + */ + return ( + this.discussion.diff_file || { + file_path: this.discussion.original_position.new_path, + } + ); + }, }, mounted() { if (this.isTextFile && !this.hasTruncatedDiffLines) { @@ -98,9 +120,9 @@ export default {