kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2022-04-26 06:09:56 +00:00
parent c2d7378a68
commit f88f72df02
12 changed files with 126 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GITLAB_SHELL_VERSION
View File

@ -1 +1 @@
13.25.1
13.25.2

15
app/assets/javascripts/behaviors/markdown/render_sandboxed_mermaid.js
View File

@ -53,9 +53,6 @@ function fixElementSource(el) {
// Mermaid doesn't like `<br />` tags, so collapse all like tags into `<br>`, which is parsed correctly.
const source = el.textContent?.replace(/<br\s*\/>/g, '<br>');
// Remove any extra spans added by the backend syntax highlighting.
Object.assign(el, { textContent: source });
return { source };
}
@ -78,17 +75,13 @@ function renderMermaidEl(el, source) {
width: '100%',
});
// Add the original source into the DOM
// to allow Copy-as-GFM to access it.
const sourceEl = document.createElement('text');
sourceEl.textContent = source;
sourceEl.classList.add('gl-display-none');
const wrapper = document.createElement('div');
wrapper.appendChild(iframeEl);
wrapper.appendChild(sourceEl);
el.closest('pre').replaceWith(wrapper);
// Hide the markdown but keep it "visible enough" to allow Copy-as-GFM
// https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83202
el.closest('pre').classList.add('gl-sr-only');
el.closest('pre').parentNode.appendChild(wrapper);
// Event Listeners
iframeEl.addEventListener('load', () => {

30
app/graphql/types/design_management/design_fields.rb
View File

@ -43,13 +43,12 @@ module Types
end
def image_v432x230(parent:)
version = cached_stateful_version(parent)
action = design.actions.up_to_version(version).most_recent.first
Gitlab::Graphql::Lazy.with_value(lazy_action(parent)) do |action|
# A `nil` return value indicates that the image has not been processed
next unless action&.image_v432x230&.file
# A `nil` return value indicates that the image has not been processed
return unless action.image_v432x230.file
Gitlab::UrlBuilder.build(design, ref: version.sha, size: :v432x230)
Gitlab::UrlBuilder.build(action.design, ref: action.version.sha, size: :v432x230)
end
end
def event(parent:)
@ -73,6 +72,25 @@ module Types
def issue
::Gitlab::Graphql::Loaders::BatchModelLoader.new(::Issue, design.issue_id).find
end
private
def lazy_action(parent)
version = cached_stateful_version(parent)
BatchLoader::GraphQL.for([version, design]).batch do |ids, loader|
by_version = ids.group_by(&:first).transform_values { _1.map(&:second) }
designs_by_id = ids.map(&:second).index_by(&:id)
by_version.each do |v, designs|
actions = ::DesignManagement::Action.most_recent.up_to_version(v).by_design(designs).with_version
actions.each do |action|
action.design = designs_by_id[action.design_id] # eliminate duplicate load
loader.call([v, action.design], action)
end
end
end
end
end
end
end

1
app/models/design_management/action.rb
View File

@ -19,6 +19,7 @@ module DesignManagement
scope :ordered, -> { order(version_id: :asc) }
scope :by_design, -> (design) { where(design: design) }
scope :by_event, -> (event) { where(event: event) }
scope :with_version, -> { preload(:version) }
# For each design, only select the most recent action
scope :most_recent, -> do

2
config/feature_flags/development/enforce_security_report_validation.yml
View File

@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351000
milestone: '14.9'
type: development
group: group::threat insights
default_enabled: false
default_enabled: true

4
lib/gitlab/ci/parsers/security/validators/schema_validator.rb
View File

@ -110,7 +110,7 @@ module Gitlab
log_warnings(problem_type: 'schema_validation_fails') unless schema_validation_errors.empty?
if Feature.enabled?(:enforce_security_report_validation, @project)
if Feature.enabled?(:enforce_security_report_validation, @project, default_enabled: :yaml)
@errors += schema_validation_errors
else
@warnings += schema_validation_errors
@ -147,7 +147,7 @@ module Gitlab
def add_unsupported_report_version_message
log_warnings(problem_type: 'using_unsupported_schema_version')
if Feature.enabled?(:enforce_security_report_validation, @project)
if Feature.enabled?(:enforce_security_report_validation, @project, default_enabled: :yaml)
handle_unsupported_report_version(treat_as: :error)
else
handle_unsupported_report_version(treat_as: :warning)

4
package.json
View File

@ -161,7 +161,7 @@
"prosemirror-model": "^1.16.1",
"prosemirror-state": "^1.3.4",
"prosemirror-tables": "^1.1.1",
"prosemirror-view": "^1.23.10",
"prosemirror-view": "^1.23.12",
"raphael": "^2.2.7",
"raw-loader": "^4.0.2",
"rehype-raw": "^6.1.1",
@ -249,7 +249,7 @@
"prettier": "2.2.1",
"prosemirror-schema-basic": "^1.1.2",
"prosemirror-schema-list": "^1.1.6",
"prosemirror-test-builder": "^1.0.5",
"prosemirror-test-builder": "^1.0.6",
"purgecss": "^4.0.3",
"purgecss-from-html": "^4.0.3",
"sass": "^1.32.12",

37
spec/features/markdown/mermaid_spec.rb
View File

@ -5,6 +5,9 @@ require 'spec_helper'
RSpec.describe 'Mermaid rendering', :js do
let_it_be(:project) { create(:project, :public) }
let(:is_mac) { page.evaluate_script('navigator.platform').include?('Mac') }
let(:modifier_key) { is_mac ? :command : :control }
before do
stub_feature_flags(sandboxed_mermaid: false)
end
@ -300,6 +303,40 @@ RSpec.describe 'Mermaid rendering', :js do
expect(page).not_to have_xpath("//iframe")
end
end
it 'correctly copies and pastes to/from the clipboard' do
stub_feature_flags(sandboxed_mermaid: true)
description = <<~MERMAID
```mermaid
graph TD;
A-->B;
A-->C;
```
MERMAID
issue = create(:issue, project: project, description: description)
user = create(:user)
sign_in(user)
visit project_issue_path(project, issue)
wait_for_requests
wait_for_mermaid
find('pre.language-mermaid').hover
find('copy-code button').click
sleep 2
find('#note-body').send_keys [modifier_key, 'v']
wait_for_requests
# The codefences do actually get included, but we can't get spec to pass
# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83202#note_880621264
expect(find('#note-body').value.strip).to eq("graph TD;\n A-->B;\n A-->C;")
end
end
def wait_for_mermaid

31
spec/frontend/behaviors/markdown/render_sandboxed_mermaid_spec.js Normal file
View File

@ -0,0 +1,31 @@
import $ from 'jquery';
import renderMermaid from '~/behaviors/markdown/render_sandboxed_mermaid';
describe('Render mermaid diagrams for Gitlab Flavoured Markdown', () => {
it('Does something', () => {
document.body.dataset.page = '';
setFixtures(`
<div class="gl-relative markdown-code-block js-markdown-code">
<pre data-sourcepos="1:1-7:3" class="code highlight js-syntax-highlight language-mermaid white" lang="mermaid" id="code-4">
<code class="js-render-mermaid">
<span id="LC1" class="line" lang="mermaid">graph TD;</span>
<span id="LC2" class="line" lang="mermaid">A--&gt;B</span>
<span id="LC3" class="line" lang="mermaid">A--&gt;C</span>
<span id="LC4" class="line" lang="mermaid">B--&gt;D</span>
<span id="LC5" class="line" lang="mermaid">C--&gt;D</span>
</code>
</pre>
<copy-code>
<button type="button" class="btn btn-default btn-md gl-button btn-icon has-tooltip" data-title="Copy to clipboard" data-clipboard-target="pre#code-4">
<svg><use xlink:href="/assets/icons-7f1680a3670112fe4c8ef57b9dfb93f0f61b43a2a479d7abd6c83bcb724b9201.svg#copy-to-clipboard"></use></svg>
</button>
</copy-code>
</div>`);
const els = $('pre.js-syntax-highlight').find('.js-render-mermaid');
renderMermaid(els);
jest.runAllTimers();
expect(document.querySelector('pre.js-syntax-highlight').classList).toContain('gl-sr-only');
});
});

9
spec/models/design_management/action_spec.rb
View File

@ -49,6 +49,15 @@ RSpec.describe DesignManagement::Action do
end
end
describe '.with_version' do
it 'preloads the version' do
actions = described_class.with_version
expect { actions.map(&:version) }.not_to exceed_query_limit(2)
expect(actions.count).to be > 2
end
end
describe '.by_event' do
it 'returns the actions by event type' do
expect(described_class.by_event(:deletion)).to match_array([action_a_2, action_c])

8
spec/requests/api/graphql/project/issue/designs/designs_spec.rb
View File

@ -273,8 +273,10 @@ RSpec.describe 'Getting designs related to an issue' do
end
it 'returns the correct v432x230-sized design images' do
v0 = design.actions.most_recent.first.version
expect(design_nodes).to contain_exactly(
a_hash_including('imageV432x230' => design_image_url(design, ref: version.sha, size: :v432x230)),
a_hash_including('imageV432x230' => design_image_url(design, ref: v0.sha, size: :v432x230)),
a_hash_including('imageV432x230' => design_image_url(second_design, ref: version.sha, size: :v432x230))
)
end
@ -323,8 +325,10 @@ RSpec.describe 'Getting designs related to an issue' do
end
it 'returns the correct v432x230-sized design images' do
v0 = design.actions.most_recent.first.version
expect(design_nodes).to contain_exactly(
a_hash_including('imageV432x230' => design_image_url(design, ref: version.sha, size: :v432x230)),
a_hash_including('imageV432x230' => design_image_url(design, ref: v0.sha, size: :v432x230)),
a_hash_including('imageV432x230' => design_image_url(second_design, ref: version.sha, size: :v432x230))
)
end

16
yarn.lock
View File

@ -10121,10 +10121,10 @@ prosemirror-tables@^1.1.1:
prosemirror-transform "^1.2.1"
prosemirror-view "^1.13.3"
prosemirror-test-builder@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/prosemirror-test-builder/-/prosemirror-test-builder-1.0.5.tgz#d05e8f77484aef192d705c46fe648d0319d69000"
integrity sha512-mymXkqJlhcB4JtQpM5buHvfn7SawJ2vRwYzuIUMkky00ILBOPUnwUCAbjA7L8o4hsaQeyHljRCNdpjXKK8KsOw==
prosemirror-test-builder@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/prosemirror-test-builder/-/prosemirror-test-builder-1.0.6.tgz#5b3df044beee6050791e96abc80fb48e66be30ea"
integrity sha512-71pbSJqaqUJfbLwGett1yhMRQ/TV7QcOPfHvj6X9U/u/nQeZQNnsHsaVBpUeLgICADtusQSVPvyeGC0LGknwgA==
dependencies:
prosemirror-model "^1.0.0"
prosemirror-schema-basic "^1.0.0"
@ -10137,10 +10137,10 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor
dependencies:
prosemirror-model "^1.0.0"
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.23.10, prosemirror-view@^1.23.6:
version "1.23.10"
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.23.10.tgz#a3fb6a7c780c8cd84488fdd451c23becab9dbefb"
integrity sha512-/p8Orb1VeJEbf7Z/BltU9GMWADZRqKlna6TlQGK1snJ6fTdLRC4f4yF2MgNK4OMQjmAwJISUtEp5+Vu5CSbR1w==
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.23.12, prosemirror-view@^1.23.6:
version "1.23.12"
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.23.12.tgz#196436a964abbd25a7d8efad879575e80d286ba6"
integrity sha512-uvw9ZVz5dNDD9w1bzHkU2r4NWFlpFz85v9rCD8NAhQBau6LYhwM/crjry+C4JgeR8gy6pMXS5eJ1zhNLcK4ctQ==
dependencies:
prosemirror-model "^1.16.0"
prosemirror-state "^1.0.0"