VladPolskiy/gitlab-ce
1
0
Fork 0
mirror of https://github.com/gitlabhq/gitlabhq.git synced 2025-08-19 01:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@16-2-stable-ee

Browse Source
This commit is contained in:
GitLab Bot
2023-08-10 17:54:21 +00:00
parent 3abfe4afb9
commit feb60f7306
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/concerns/web_ide_csp.rb
View File

@ -21,7 +21,7 @@ module WebIdeCSP
default_src = Array(request.content_security_policy.directives['default-src'] || []) 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'] ||= 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'] ||= default_src
request.content_security_policy.directives['worker-src'].concat([webpack_url]) request.content_security_policy.directives['worker-src'].concat([webpack_url])

2
package.json
View File

@ -60,7 +60,7 @@
"@gitlab/svgs": "3.55.0", "@gitlab/svgs": "3.55.0",
"@gitlab/ui": "64.20.1", "@gitlab/ui": "64.20.1",
"@gitlab/visual-review-tools": "1.7.3", "@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", "@mattiasbuelens/web-streams-adapter": "^0.1.0",
"@popperjs/core": "^2.11.2", "@popperjs/core": "^2.11.2",
"@rails/actioncable": "7.0.6", "@rails/actioncable": "7.0.6",

2
spec/requests/ide_controller_spec.rb
View File

@ -187,7 +187,7 @@ RSpec.describe IdeController, feature_category: :web_ide do
it 'updates the content security policy with the correct frame sources' do it 'updates the content security policy with the correct frame sources' do
subject 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/") expect(find_csp_directive('worker-src')).to include("http://www.example.com/assets/webpack/")
end end

2
spec/requests/web_ide/remote_ide_controller_spec.rb
View File

@ -73,7 +73,7 @@ RSpec.describe WebIde::RemoteIdeController, feature_category: :remote_developmen
end end
it "updates the content security policy with the correct frame sources" do 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
end end

8
yarn.lock
View File

@ -1151,10 +1151,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.7.3.tgz#9ea641146436da388ffbad25d7f2abe0df52c235" 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== integrity sha512-NMV++7Ew1FSBDN1xiZaauU9tfeSfgDHcOLpn+8bGpP+O5orUPm2Eu66R5eC5gkjBPaXosNAxNWtriee+aFk4+g==
"@gitlab/web-ide@0.0.1-dev-20230713160749-patch-1": "@gitlab/web-ide@0.0.1-dev-20230802205337":
version "0.0.1-dev-20230713160749-patch-1" version "0.0.1-dev-20230802205337"
resolved "https://registry.yarnpkg.com/@gitlab/web-ide/-/web-ide-0.0.1-dev-20230713160749-patch-1.tgz#6420b55aae444533f9a4bd6269503d98a72aaa2e" resolved "https://registry.yarnpkg.com/@gitlab/web-ide/-/web-ide-0.0.1-dev-20230802205337.tgz#bd1954486e9d615d65864cfa9ce4876ebc2a29a4"
integrity sha512-Dh8XQyPwDY6fkd/A+hTHCqrD23u5qnlaxKu5myyxDEgBNGgu4SGblFU9B6NHNm8eGUZk6Cs5MuMk+NUvWRKbmA== integrity sha512-cek6IixB+oW39iYwyce+x9yiHWdZn4EwDeXCLgdzWpYl74tccKFfkjt2ZTtWsfZUKGE+xJkoeTE+ZKnoeaUSPA==
"@graphql-eslint/eslint-plugin@3.20.0": "@graphql-eslint/eslint-plugin@3.20.0":
version "3.20.0" version "3.20.0"