maxmustermann/gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '345075-bug-code-suggestion-for-ipynb-mr-breaks-the-file' into 'master'

Browse source 
Disable Code Suggestion for ipynb diffs

See merge request gitlab-org/gitlab!73948
This commit is contained in:
Vasilii Iakliushin 2021-11-10 18:37:05 +00:00
parent 04fe0a4d71 95519c8de5
commit 0ed791101d
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/suggestion.rb
View file

@ -50,6 +50,7 @@ def inapplicable_reason(cached: true)
next _("Can't apply as the source branch was deleted.") unless noteable.source_branch_exists?
next outdated_reason if outdated?(cached: cached) || !note.active?
next _("This suggestion already matches its content.") unless different_content?
next _("This file was modified for readability, and can't accept suggestions. Edit it directly.") if file_path.end_with? "ipynb"
end
end

3
locale/gitlab.pot
View file

@ -35196,6 +35196,9 @@ msgstr ""
msgid "This field is required."
msgstr ""
msgid "This file was modified for readability, and can't accept suggestions. Edit it directly."
msgstr ""
msgid "This form is disabled in preview"
msgstr ""

8
spec/models/suggestion_spec.rb
View file

@ -154,6 +154,14 @@
it { is_expected.to eq("This suggestion already matches its content.") }
end
context 'when file is .ipynb' do
before do
allow(suggestion).to receive(:file_path).and_return("example.ipynb")
end
it { is_expected.to eq(_("This file was modified for readability, and can't accept suggestions. Edit it directly.")) }
end
context 'when applicable' do
it { is_expected.to be_nil }
end