Commit Graph

26 Commits

Author SHA1 Message Date
Phil Hughes 12edecd002
Add headers to files in the tree list on merge requests
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54807
2019-01-08 09:31:23 +00:00
Sam Bigelow 9c18798275 Utilize :key to minimize extra rerenders
The diff notes automatically focus on mount, and when using the index
(as opposed to line_code) for the v-bind:key, the comment form gets
unnecessarily remounted, and therefore refocused.
2018-12-17 20:25:41 -05:00
Mike Greiling 7c4e996c74 Merge branch 'winh-merge-request-diff-discussion-commit-id' into 'master'
Pass commit when posting diff discussions

See merge request gitlab-org/gitlab-ce!23371
2018-12-07 09:06:14 +00: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
Winnie Hellmann e7439c3104 Pass commit when posting diff discussions 2018-12-05 22:36:51 +01: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 9fd5a78d8b
Fixed failing specs
Added tests to file row truncated text computed prop
2018-10-23 09:12:37 +01:00
Phil Hughes 2d00e7fce5
Add list mode to file browser in diffs
This adds toggle buttons to switch between file & tree list.
For file list, it renders the truncated paths with the ellipsis
at the start of the path.

When focusing the input, it hides the toggle buttons.
On blur, the buttons get shown again.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51859
2018-10-23 09:12:36 +01:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02: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
Phil Hughes 33c4c5b8f3
Added file tree to merge request diffs
This file tree displays all the diff files in a tree like format
Each file is taken and converted into a tree with folders
Each folder can be toggled open & closed
Clicking a file will scroll to the diff file & highlight with a glow affect

Searching the tree list will search only files & return a list of the
files without any folders

Each file row contains an icon to show changed, new file or deleted
Each row will also contain the added & removed lines count

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
2018-10-03 10:05:43 +01: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
Phil Hughes f1a3eff8d5 Fixed utils spec 2018-09-21 11:59:45 +01:00
Phil Hughes e3cc9d53d2 Fixed karma spec for getNoteFormData
Fixed toggling new notes caused by not returning the stores discussion
2018-09-21 11:59:44 +01:00
Phil Hughes 90673dbcb8
Changed isDiscussionApplicableToLine to accept an object 2018-09-18 16:27:53 +01:00
Phil Hughes c48f0c1aed
Added specs to isDiscussionApplicableToLine
It now tests for the latest diff check
2018-09-17 10:49:41 +01:00
Phil Hughes 5eef5f242a
Updated LegacyDiffNote logic 2018-09-17 09:50:38 +01:00
Phil Hughes f9e290b9db
Fixed diff store actions spec
Updated diff mutations and utils spec to check for legacy notes
2018-09-17 09:50:37 +01:00
Tim Zallmann 12b48e61af Resolve "On master, inline diff view contains extra `+` and `-` signs" 2018-09-10 08:50:41 +00:00
André Luís 04c0d12d1a Resolve "Merge requests show outdated discussions on changes tab" 2018-09-08 06:37:41 +00:00
Tim Zallmann b8ecb2c7eb Added new tests for newly added mutations, actions, utils 2018-09-07 12:25:50 +02:00
Tim Zallmann a424e8141b Fixes for Karma Tests 2018-09-07 12:25:50 +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
Filipa Lacerda 49828db524 Improves performance on MR refactor and adds specs 2018-07-05 12:05:57 +00:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00