0b12a5312c
Add latest changes from gitlab-org/gitlab@master
2020-01-14 21:07:45 +00:00
4ce0bee95d
Add latest changes from gitlab-org/gitlab@master
2020-01-14 12:07:41 +00:00
e3764d340e
Add latest changes from gitlab-org/gitlab@master
2019-12-19 12:07:35 +00:00
e723867717
Add latest changes from gitlab-org/gitlab@master
2019-12-17 18:07:48 +00:00
47b8f79a08
Add latest changes from gitlab-org/gitlab@master
2019-12-13 00:08:05 +00:00
784fae4b9d
Add latest changes from gitlab-org/gitlab@master
2019-12-12 12:07:33 +00:00
fc53ce8e6c
Add latest changes from gitlab-org/gitlab@master
2019-12-12 09:07:48 +00:00
93c6764dac
Add latest changes from gitlab-org/gitlab@master
2019-12-09 12:07:58 +00:00
b41cd8cb92
Add latest changes from gitlab-org/gitlab@master
2019-12-04 18:08:46 +00:00
23d237110e
Add latest changes from gitlab-org/gitlab@master
2019-11-26 09:08:36 +00:00
bbdad735a0
Refactor DiffFileHeader tests
...
* Switched from Karma to Jest
* Reorganized tests to have correct semantics
* Removed unused computed properties from component
2019-09-12 05:04:22 +00:00
fc0ff7cf03
Replace ... with new expansion options
...
- expand upwards
- expand downwards
- expand all
in both inline and parallel views
2019-08-10 02:36:32 +00:00
d4151b14c2
Rebased and squashed commits
...
- all commits squashed to make danger review happy
2019-07-03 08:26:57 +00:00
d2fd6bd510
Added diff suggestion popover
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
2019-06-14 14:01:24 +01:00
7aac4e5c3f
Fix whitespace changes visibility when the related file was initially collapsed
2019-06-05 07:27:08 +00:00
40eb7f72b9
Fixes issues with show whitespace button in diffs
...
Correctly updates the URL without overwriting parameters
Reloads the diff file content without reloading the page
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58852 , https://gitlab.com/gitlab-org/gitlab-ce/issues/42597
2019-05-10 19:06:37 +01:00
9d24d4a8fd
Impove the performance of expanding full diff
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597
2019-05-03 08:33:15 +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
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
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
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
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
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
24b98a8793
Added specs for mutations & utils methods
2019-01-16 17:24:05 +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
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
e64c9c2112
Fixed duplicated inline diff discussions
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55388
2018-12-14 21:32:41 +00: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
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
9afc3069b0
Fixed diff files not expanding
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54868
2018-12-04 17:51:57 +00:00
44a0121ad4
Resolve "Merge request refactor does not highlight selected line"
2018-11-30 08:48:47 +00:00
adf8ad9eee
Improve discussion rendering performance
...
Improve the renderign of new and existing discussions
by reducing the number of watchers on each object & array.
Previously every discussion change would trigger an update for every
discussion component.
Also tidied up some components to get them closer to our docs.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51506
2018-11-27 11:40:39 +00:00
4a2b19706c
Rename diffs store variable
2018-11-15 18:16:27 +02:00
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
f9b4130bb7
Comment on any expanded diff line on MRs
2018-11-09 16:56:48 -02:00
198402b38b
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
...
This reverts commit a82a595728e7df959b8f
2018-11-07 19:57:26 -02:00
GitLab Bot
Illya Klymov
Samantha Ming
Natalia Tepluhina
Phil Hughes
Ondřej Budai
Denys Mishunov
Filipa Lacerda
Douwe Maan
Sam Bigelow
André Luís
Mike Greiling
Winnie Hellmann
George Tsiolis
Oswaldo Ferreira