Commit Graph

24 Commits

Author SHA1 Message Date
Douwe Maan 40e3f207cb
Remove now-unnecessary noteable_line class 2019-03-26 14:37:14 +01: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
Natalia Tepluhina 7407dfdc20 Resolve "In Merge Request diff screen, master is not a hyperlink" 2019-01-16 13:18:10 +00:00
Oswaldo Ferreira ed3034bbb7 Allow suggesting single line changes in diffs 2018-12-13 19:17:19 +00: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 234563ba30
Made diff & note data consistent
This caused many pain points when working with it.
Part of the data was camel cased the other snake case.
Other parts where snake case & then getting converted in components,
this conversion has the potential for leaking memory.

This changes that & makes it consistent with what it returned from the
API, snake case.
2018-11-14 19:16:46 +00:00
Phil Hughes 35faecb06b
Restored width & height properties 2018-11-06 10:17:59 +00:00
Phil Hughes f7df9ddb52
Re-implemented image commenting on diffs
This re-implements image commenting in merge request diffs.
This feature was previously lost when the merge request
page was refactored into Vue.

With this, we create an overlay component. The overlay
component handles displaying the comment badges
and the comment form badge.
Badges are displayed based on the position attribute
sent with the discussion.

Comment forms for diff files are controlled through
a different state property. This is so we don't
tie comment forms to diff files directly creating
deep nested state. Instead we create a flat array
which holds the file hash & the X & Y position of
the comment form.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
2018-11-05 14:02:41 +00:00
Jacques Erasmus 4508343d16 Fix broken "Show whitespace changes" button on MR "Changes" tab 2018-10-29 16:16:40 +00:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Oswaldo Ferreira caf10464c0 Fix LFS uploaded images not being rendered 2018-10-05 22:36:20 +00:00
Phil Hughes 14ed916cf2 Merge branch '51958-fix-mr-discussion-loading' into 'master'
Fix MR discussion not loaded issue

Closes #51958

See merge request gitlab-org/gitlab-ce!21982
2018-10-04 07:37:24 +00:00
Fatih Acet 8aedb71c49
Fix showing diff file header for renamed files 2018-10-03 21:37:54 +02:00
Mark Chao f09303b00a Fix MR discussion not loaded issue
Display `formatter` as the sole content of `position` object.
This means `diff_file` data is not referenced, which is the
caseu of "IOError: not opened for reading".
2018-10-01 22:37:43 +08:00
Paul Slaughter f390184249 Resolve "Commit details are not displayed when reviewing an MR commit by commit" 2018-09-26 08:28:50 +00:00
Mike Greiling 6d1b585034 Merge branch 'tz-mr-new-datastructure' into 'master'
Vue MR Page - Data structure update

See merge request gitlab-org/gitlab-ce!21062
2018-09-07 23:27:24 +00:00
Jan Provaznik d95c1f0335 Use ResourceLabelEvent for tracking label changes 2018-09-07 13:39:20 +00:00
Tim Zallmann a424e8141b Fixes for Karma Tests 2018-09-07 12:25:50 +02:00
Tim Zallmann b8b2cb3675 Fixed Problems with Inline View + Specs 2018-09-07 12:25:50 +02:00
Tim Zallmann 3e9965f767 Fix for diff_file specs 2018-08-08 10:46:17 +02:00
André Luís 09c1b008eb Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"
This reverts commit 740ae2d194, reversing
changes made to 1ba47de5fe.
2018-08-01 13:45:16 +01:00
Fatih Acet 7632330e50
Fix showing outdated discussions on Changes tab 2018-07-18 00:07:37 +02:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00