Commit Graph

21 Commits

Author SHA1 Message Date
GitLab Bot f0c0458b3c Add latest changes from gitlab-org/gitlab@master 2020-08-28 12:10:37 +00:00
GitLab Bot ade18c9d68 Add latest changes from gitlab-org/gitlab@master 2020-04-02 09:08:14 +00:00
GitLab Bot 232e0a31f1 Add latest changes from gitlab-org/gitlab@master 2020-03-13 21:09:38 +00:00
GitLab Bot bd8fb5668a Add latest changes from gitlab-org/gitlab@master 2020-03-03 00:08:11 +00:00
GitLab Bot 991a295378 Add latest changes from gitlab-org/gitlab@master 2019-11-11 00:06:26 +00:00
Phil Hughes e363e76af2
Fixed expand full file button showing on images
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59695
2019-04-01 18:29:10 +01:00
Phil Hughes 3b158409b3
Remove expand diff to full file feature flag 2019-03-26 18:20:02 +00:00
Mark Chao 8723f29255 Fix diff bottom expand button appears twice
This is a quick fix by only append match line once
when calling diff_lines_for_serializer multiple time.

Also enable feature by default
2019-03-21 23:08:29 +08:00
Phil Hughes b14de8e1f5 Add option to expand diff to full file
The user can also toggle between the diff changes and
the full file diff.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
2019-03-06 15:51:44 +08:00
Natalia Tepluhina bf8f32da7f Replaced part of diff file properties with diff viewer
- replaced file.too_large
- replaced file.text
- replaced file.collapsed
2019-02-15 17:56:50 +00:00
Sean Nichols 05dcb2dd76 Display empty files properly on MR diffs 2018-12-11 23:49:04 -05:00
Oswaldo Ferreira 26b94bcc7d Remove unused data from discussions endpoint
We don't need a series of attributes to render diff files on
discussions.json request. Therefore this MR removes lots of unnecessary
attributes from the request, mainly the highlighted diff lines, which
are pretty expensive.
2018-12-06 17:07:49 -08:00
Phil Hughes 2ed65be1c3
Fixed renamed and mode changed diff viewers
Renders mode changed and renamed file merge request diff
viewers on the frontend.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607
2018-12-06 14:39:29 +00:00
Oswaldo Ferreira caf10464c0 Fix LFS uploaded images not being rendered 2018-10-05 22:36:20 +00:00
Fatih Acet 8aedb71c49
Fix showing diff file header for renamed files 2018-10-03 21:37:54 +02:00
Felipe Artur 5bc54ca425 Use a serializer to render diff lines 2018-08-31 15:32:48 -03:00
Francisco Javier López edb5759caf Fixed project logo when it is LFS tracked 2018-08-30 12:34:41 +00:00
gfyoung dce26700b2 Enable frozen string in app/serializers/**/*.rb
Partially addresses #47424.
2018-07-23 11:27:39 -07:00
Felipe Artur 6d41df5071 Render LegacyDiffNote when diff_file blob is nil 2018-07-04 12:34:41 -03:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00