Merge branch 'security-fix-merge-request-diff-with-encoding-issues-13-11' into '13-11-stable-ee' (e73e17ec) · Commits · gitlab-cn / Gitlab · JiHu GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Gitlab
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

gitlab-cn
Gitlab
Commits
e73e17ec

Commit e73e17ec authored 4 years ago by

GitLab Release Tools Bot

Downloads
- Plain Diff

Merge branch 'security-fix-merge-request-diff-with-encoding-issues-13-11' into '13-11-stable-ee'

Fix merge request diff display issue with unsupported encoding

See merge request gitlab-org/security/gitlab!1425

parents 47c81a8f 33971ea6

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/vue_shared/components/diff_viewer/viewers/not_diffable.vue 1 addition, 1 deletion

...ue_shared/components/diff_viewer/viewers/not_diffable.vue
app/views/projects/diffs/viewers/_not_diffable.html.haml 1 addition, 1 deletion

app/views/projects/diffs/viewers/_not_diffable.html.haml
lib/gitlab/diff/file.rb 10 additions, 1 deletion

lib/gitlab/diff/file.rb
lib/gitlab/diff/parser.rb 1 addition, 1 deletion

lib/gitlab/diff/parser.rb
lib/gitlab/git/diff.rb 9 additions, 2 deletions

lib/gitlab/git/diff.rb
locale/gitlab.pot 3 additions, 3 deletions

locale/gitlab.pot
spec/features/expand_collapse_diffs_spec.rb 1 addition, 1 deletion

spec/features/expand_collapse_diffs_spec.rb
spec/features/projects/diffs/diff_show_spec.rb 10 additions, 0 deletions

spec/features/projects/diffs/diff_show_spec.rb
spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb 1 addition, 1 deletion

...ib/gitlab/diff/file_collection/merge_request_diff_spec.rb
spec/lib/gitlab/diff/file_spec.rb 45 additions, 13 deletions

spec/lib/gitlab/diff/file_spec.rb
spec/lib/gitlab/diff/parser_spec.rb 10 additions, 0 deletions

spec/lib/gitlab/diff/parser_spec.rb

with 92 additions and 24 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment