diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-10 20:54:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-10 20:54:21 +0300 |
commit | feb60f73068de1ffd89ff7baade92586b4690e9d (patch) | |
tree | 708364a0941270613604981f3906c2038f92e12b | |
parent | 3abfe4afb90054d7b8af276775e528551a4a5a32 (diff) |
Add latest changes from gitlab-org/gitlab@16-2-stable-ee
-rw-r--r-- | app/controllers/concerns/web_ide_csp.rb | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | spec/requests/ide_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/web_ide/remote_ide_controller_spec.rb | 2 | ||||
-rw-r--r-- | yarn.lock | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/concerns/web_ide_csp.rb b/app/controllers/concerns/web_ide_csp.rb index 0327020a0c2..90d6ff38e90 100644 --- a/app/controllers/concerns/web_ide_csp.rb +++ b/app/controllers/concerns/web_ide_csp.rb @@ -21,7 +21,7 @@ module WebIdeCSP default_src = Array(request.content_security_policy.directives['default-src'] || []) request.content_security_policy.directives['frame-src'] ||= default_src - request.content_security_policy.directives['frame-src'].concat([webpack_url, 'https://*.vscode-cdn.net/']) + request.content_security_policy.directives['frame-src'].concat([webpack_url, 'https://*.web-ide.gitlab-static.net/']) request.content_security_policy.directives['worker-src'] ||= default_src request.content_security_policy.directives['worker-src'].concat([webpack_url]) diff --git a/package.json b/package.json index ac838559367..d3b02de46e8 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@gitlab/svgs": "3.55.0", "@gitlab/ui": "64.20.1", "@gitlab/visual-review-tools": "1.7.3", - "@gitlab/web-ide": "0.0.1-dev-20230713160749-patch-1", + "@gitlab/web-ide": "0.0.1-dev-20230802205337", "@mattiasbuelens/web-streams-adapter": "^0.1.0", "@popperjs/core": "^2.11.2", "@rails/actioncable": "7.0.6", diff --git a/spec/requests/ide_controller_spec.rb b/spec/requests/ide_controller_spec.rb index 5b7da9ce84f..4131f1d26ec 100644 --- a/spec/requests/ide_controller_spec.rb +++ b/spec/requests/ide_controller_spec.rb @@ -187,7 +187,7 @@ RSpec.describe IdeController, feature_category: :web_ide do it 'updates the content security policy with the correct frame sources' do subject - expect(find_csp_directive('frame-src')).to include("http://www.example.com/assets/webpack/", "https://*.vscode-cdn.net/") + expect(find_csp_directive('frame-src')).to include("http://www.example.com/assets/webpack/", "https://*.web-ide.gitlab-static.net/") expect(find_csp_directive('worker-src')).to include("http://www.example.com/assets/webpack/") end diff --git a/spec/requests/web_ide/remote_ide_controller_spec.rb b/spec/requests/web_ide/remote_ide_controller_spec.rb index 62f5cb90e0a..d4248af6482 100644 --- a/spec/requests/web_ide/remote_ide_controller_spec.rb +++ b/spec/requests/web_ide/remote_ide_controller_spec.rb @@ -73,7 +73,7 @@ RSpec.describe WebIde::RemoteIdeController, feature_category: :remote_developmen end it "updates the content security policy with the correct frame sources" do - expect(find_csp_directive('frame-src')).to include("http://www.example.com/assets/webpack/", "https://*.vscode-cdn.net/") + expect(find_csp_directive('frame-src')).to include("http://www.example.com/assets/webpack/", "https://*.web-ide.gitlab-static.net/") end end diff --git a/yarn.lock b/yarn.lock index 123d6a0bda1..64e286dcffc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1151,10 +1151,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.7.3.tgz#9ea641146436da388ffbad25d7f2abe0df52c235" integrity sha512-NMV++7Ew1FSBDN1xiZaauU9tfeSfgDHcOLpn+8bGpP+O5orUPm2Eu66R5eC5gkjBPaXosNAxNWtriee+aFk4+g== -"@gitlab/web-ide@0.0.1-dev-20230713160749-patch-1": - version "0.0.1-dev-20230713160749-patch-1" - resolved "https://registry.yarnpkg.com/@gitlab/web-ide/-/web-ide-0.0.1-dev-20230713160749-patch-1.tgz#6420b55aae444533f9a4bd6269503d98a72aaa2e" - integrity sha512-Dh8XQyPwDY6fkd/A+hTHCqrD23u5qnlaxKu5myyxDEgBNGgu4SGblFU9B6NHNm8eGUZk6Cs5MuMk+NUvWRKbmA== +"@gitlab/web-ide@0.0.1-dev-20230802205337": + version "0.0.1-dev-20230802205337" + resolved "https://registry.yarnpkg.com/@gitlab/web-ide/-/web-ide-0.0.1-dev-20230802205337.tgz#bd1954486e9d615d65864cfa9ce4876ebc2a29a4" + integrity sha512-cek6IixB+oW39iYwyce+x9yiHWdZn4EwDeXCLgdzWpYl74tccKFfkjt2ZTtWsfZUKGE+xJkoeTE+ZKnoeaUSPA== "@graphql-eslint/eslint-plugin@3.20.0": version "3.20.0" |