3b158409b3
Remove expand diff to full file feature flag
2019-03-26 18:20:02 +00:00
40e3f207cb
Remove now-unnecessary noteable_line class
2019-03-26 14:37:14 +01:00
514ee63826
Move some tests from Karma to Jest
2019-03-23 17:53:46 +01:00
27fa7b9ca8
Collapse diff tree is only one file is present
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53139
2019-03-19 11:34:21 +00:00
c36095b2e3
Fix expand all button not working
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
2019-03-11 13:09:36 +00:00
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
294f0f3991
CE backport of batch-comments-ee-store-module
2019-03-04 11:27:57 +00:00
edfdf568d3
Resolve "Add missing karma tests to the the MR Diff components"
2019-02-28 08:23:17 +00:00
0aff8e2753
Set up basic keyboard next/previous navigation in diff list
...
Mousetrap is used as the help-tool to listen to keystrokes
Added currentDiffIndex getter to store that holds
the index of currently active diff file in the list
Instead of computing it on the component, we will take advantage of it
being available for all components in DiffsApp
Testing keyboard navigation and jumpToFile()
2019-02-27 09:12:13 +00:00
fe10964a68
Merge branch 'fix-diffs-not-rendering' into 'master'
...
Fix diff files not rendering
See merge request gitlab-org/gitlab-ce!25358
2019-02-18 16:19:19 +00:00
512f9624fa
Fix diff files not rendering
...
Fixes some diff files not rendering when the renderIt
property is updated.
Previously it was using a local copy of renderIt which meant
Vue wouldn't update it when the files renderIt property was updates
2019-02-18 15:16:04 +00:00
fea813ab93
Merge branch 'diff-tree-resizable' into 'master'
...
Make the file tree in merge requests resizable
Closes #51857
See merge request gitlab-org/gitlab-ce!25097
2019-02-18 12:53:03 +00:00
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
d17de657fe
Make the file tree in merge requests resizable
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51857
2019-02-15 10:33:33 +00:00
a64bc0c1cd
Fixed diff rendering causing a duplicate key warning
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56797
2019-02-13 11:06:43 +00:00
81597427d0
Merge branch '52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-view' into 'master'
...
Resolve "Lines changed statistics is not easily visible in MR changes view"
Closes #52347
See merge request gitlab-org/gitlab-ce!24569
2019-02-07 08:05:53 +00:00
2a2f48a5b1
Clearly display diff statistics for MRs
...
Put the statistics in the compare-versions header for the entire MR
Put them in the file header for each individual file
2019-02-06 11:11:09 -06:00
6e5461d67f
Added fuzzy file finder to merge requests
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
2019-02-05 11:29:49 +00:00
e055f7d3ca
Merge branch 'diff-fix-folder-path-commas' into 'master'
...
Fixed diff tree folders being rendered incorrectly
See merge request gitlab-org/gitlab-ce!24635
2019-01-25 09:36:50 +00:00
f10d75ecf6
Fixed diff tree folders being rendered incorrectly
2019-01-24 16:14:14 +00:00
2f40aa68d9
Added dropdown for diff settings
...
Dropdown includes buttons for tree view rendering mode
and buttons for the compare view (inline or side-by-side)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55491
2019-01-24 14:48:03 +00:00
03df54b226
Trim first char of diff line text on diff discussions
...
Before, diff file `higlighted_diff_lines`/`parallel_diff_lines` and
diff discussion `truncated_diff_lines` were inconsistent: `text` and
`rich_text` on the latter included the leading +/-/<space> character,
like on the backend, while the former had no `text` and its `rich_text`
had dropped this char.
This resulted in a bug when the suggestions feature expected these diff
line objects to be identical in format and thus interchangeable, which
was not the case.
2019-01-22 17:00:16 +01:00
a0146dceb6
Resolve "Merge request file browser should always be possible show/hide"
2019-01-22 08:29:41 +00:00
75ead9a4f3
Merge branch 'diff-tree-collapse-directories' into 'master'
...
Collapses directory structure in merge request tree
Closes #53069
See merge request gitlab-org/gitlab-ce!24392
2019-01-18 11:19:32 +00:00
24b98a8793
Added specs for mutations & utils methods
2019-01-16 17:24:05 +00:00
7407dfdc20
Resolve "In Merge Request diff screen, master is not a hyperlink"
2019-01-16 13:18:10 +00:00
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
30038a40b0
Fixed Data Attribute Test
2019-01-06 15:57:15 +01:00
7b325fa60c
Added Spec for Vue Commit Item
2019-01-06 08:59:39 +01:00
70ba4ba285
Merge branch '51606-expanding-a-diff-while-having-an-open-comment-form-will-always-scroll-down-to-the-comment' into 'master'
...
Resolve "Expanding a diff while having an open comment form will always scroll down to the comment"
Closes #51606
See merge request gitlab-org/gitlab-ce!23849
2018-12-20 09:32:56 +00:00
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
2f4fe2b503
Merge branch 'inline-duplicated-discussions' into 'master'
...
Fixed duplicated inline diff discussions
Closes #55388
See merge request gitlab-org/gitlab-ce!23843
2018-12-17 12:51:50 +00:00
8d2e1b724b
Merge branch '54786-mr-empty-file-display' into 'master'
...
Display empty files properly on MR diffs
Closes #54786
See merge request gitlab-org/gitlab-ce!23671
2018-12-15 12:21:54 +00:00
e64c9c2112
Fixed duplicated inline diff discussions
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55388
2018-12-14 21:32:41 +00:00
9f9eb03f3d
Fix diff table rendering for empty files and improve tests
2018-12-13 23:52:31 -05:00
ed3034bbb7
Allow suggesting single line changes in diffs
2018-12-13 19:17:19 +00:00
ee2f3cac35
Fix diff changes empty state
...
The empty state now only gets shown when no files exist in the branch.
If the user is reviewing 2 versions with no files, we don't show the state.
Refactors the diff app spec to use Vue test utils.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48635
2018-12-13 10:57:45 +00:00
4d2448e03a
Add tests and move empty file message into own component
2018-12-13 01:49:32 -05:00
efbb950131
Added test
2018-12-12 19:45:23 +00:00
210e90dfce
Fixed notes not being applied to diff lines
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55248 , https://gitlab.com/gitlab-org/gitlab-ce/issues/55245
2018-12-12 19:29:48 +00:00
85daddbec9
Resolve "Navigating unresolved discussions on Merge Request page"
2018-12-08 07:19:03 +00:00
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
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
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
e7439c3104
Pass commit when posting diff discussions
2018-12-05 22:36:51 +01:00
cfe484795d
Merge branch 'diff-expand-commit-file' into 'master'
...
Fixed expanding diff commit files
Closes #50662
See merge request gitlab-org/gitlab-ce!23591
2018-12-05 18:04:35 +00:00
d3a8fb6e79
Fixed expanding diff commit files
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50662
2018-12-05 14:12:51 +00:00
6dfede5a6d
Fixed multiple discussions getting added to diff lines
...
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8195
2018-12-05 11:42:41 +00:00
2cd710732e
Merge branch 'expand-diff-bug' into 'master'
...
Fixed diff files not expanding
Closes #54868
See merge request gitlab-org/gitlab-ce!23555
2018-12-05 09:11:31 +00:00
9afc3069b0
Fixed diff files not expanding
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54868
2018-12-04 17:51:57 +00:00
Phil Hughes
Douwe Maan
Winnie Hellmann
Natalia Tepluhina
Denys Mishunov
Filipa Lacerda
Sam Bigelow
Tim Zallmann
Fatih Acet
Nick Thomas
Sean Nichols
Oswaldo Ferreira
André Luís
Mike Greiling