Commit Graph

50 Commits

Author SHA1 Message Date
GitLab Bot 37b681b247 Add latest changes from gitlab-org/gitlab@master 2023-06-29 12:09:16 +00:00
GitLab Bot 274a42ccfa Add latest changes from gitlab-org/gitlab@master 2023-06-27 12:08:03 +00:00
GitLab Bot e0d38e233d Add latest changes from gitlab-org/gitlab@master 2023-06-07 21:08:30 +00:00
GitLab Bot 98638cd5e4 Add latest changes from gitlab-org/gitlab@master 2023-05-12 15:13:54 +00:00
GitLab Bot 3fa33c82f9 Add latest changes from gitlab-org/gitlab@master 2023-03-28 12:08:19 +00:00
GitLab Bot 58acbd41a1 Add latest changes from gitlab-org/gitlab@master 2023-03-01 21:13:05 +00:00
GitLab Bot bc7374e612 Add latest changes from gitlab-org/gitlab@master 2022-08-18 18:10:07 +00:00
GitLab Bot ce42a2ec96 Add latest changes from gitlab-org/gitlab@master 2022-07-28 06:11:15 +00:00
GitLab Bot 1c9afffa29 Add latest changes from gitlab-org/gitlab@master 2022-05-16 12:07:51 +00:00
GitLab Bot fc8614660e Add latest changes from gitlab-org/gitlab@master 2022-04-20 21:08:12 +00:00
GitLab Bot 78cfc7cf4a Add latest changes from gitlab-org/gitlab@master 2022-02-15 15:15:04 +00:00
GitLab Bot d1b3784799 Add latest changes from gitlab-org/gitlab@master 2022-01-27 00:14:15 +00:00
GitLab Bot 613a8bc141 Add latest changes from gitlab-org/gitlab@master 2022-01-26 12:18:17 +00:00
GitLab Bot e2f984e14e Add latest changes from gitlab-org/gitlab@master 2021-09-08 12:12:01 +00:00
GitLab Bot 53af44b90f Add latest changes from gitlab-org/gitlab@master 2021-08-09 12:10:09 +00:00
GitLab Bot cb0a625459 Add latest changes from gitlab-org/gitlab@master 2021-06-18 21:10:06 +00:00
GitLab Bot 111e0ef1fa Add latest changes from gitlab-org/gitlab@master 2021-06-16 12:10:18 +00:00
GitLab Bot 42d13aebd3 Add latest changes from gitlab-org/gitlab@master 2021-04-28 15:09:35 +00:00
GitLab Bot 232e7582b0 Add latest changes from gitlab-org/gitlab@master 2021-02-22 15:10:48 +00:00
GitLab Bot 173bd0618f Add latest changes from gitlab-org/gitlab@master 2020-12-17 09:10:19 +00:00
GitLab Bot f96f2720d1 Add latest changes from gitlab-org/gitlab@master 2020-12-02 21:09:44 +00:00
GitLab Bot 5427433c6d Add latest changes from gitlab-org/gitlab@master 2020-11-11 00:08:58 +00:00
GitLab Bot 9ae0f24e76 Add latest changes from gitlab-org/gitlab@master 2020-10-31 00:09:08 +00:00
GitLab Bot 6e320396b2 Add latest changes from gitlab-org/gitlab@master 2020-10-26 12:08:44 +00:00
GitLab Bot c6283014fe Add latest changes from gitlab-org/gitlab@master 2020-09-17 12:09:37 +00:00
GitLab Bot a928c5170f Add latest changes from gitlab-org/gitlab@master 2020-09-01 09:10:28 +00:00
GitLab Bot 05480e90f3 Add latest changes from gitlab-org/gitlab@master 2020-07-28 18:09:36 +00:00
GitLab Bot 833d57e60d Add latest changes from gitlab-org/gitlab@master 2020-07-08 15:09:24 +00:00
GitLab Bot 1f5a2543e4 Add latest changes from gitlab-org/gitlab@master 2020-05-20 09:08:11 +00:00
GitLab Bot e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot 254ec28f54 Add latest changes from gitlab-org/gitlab@master 2020-04-09 21:09:19 +00:00
GitLab Bot 784fae4b9d Add latest changes from gitlab-org/gitlab@master 2019-12-12 12:07:33 +00:00
GitLab Bot 23d237110e Add latest changes from gitlab-org/gitlab@master 2019-11-26 09:08:36 +00:00
Phil Hughes 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
Sam Bigelow 5b2b9fe0d6 Only make margin-auto on large screens for diff file header 2019-04-10 15:53:23 -04:00
Sam Bigelow bf47270e90 Improve diff navigation header
- Compare versions header is full width except in the unified diff mode
with no tree sidebar
  - Bar is always full width, but the content within stays centered when
unified and no tree sidebar
- File header is the same height as the "Compare versions header"
- aligns with the design system grid guidelines => 56px
- Diff file headers use a button group, switch icon order to open file
externally being the last option, all buttons will become icon buttons
(icon delivery by @dimitrieh)
- If a file header becomes sticky no rounded corner/double border
problem is visible anymore
2019-04-05 14:57:01 -04: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
Phil Hughes 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
Phil Hughes 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
Phil Hughes 9ff20ad76d
Collapses directory structure in merge request tree
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53069
2019-01-15 13:39:24 +00:00
Oswaldo Ferreira 198402b38b Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
This reverts commit a82a595728, reversing
changes made to e7df959b8f.
2018-11-07 19:57:26 -02:00
Douwe Maan a82a595728 Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'
Comment on any expanded diff line on MRs

See merge request gitlab-org/gitlab-ce!22398
2018-11-07 11:56:46 +00:00
Oswaldo Ferreira ec66ef1b74 Comment on any expanded diff line on MRs 2018-11-06 17:39:31 -02: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
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
Phil Hughes 8064ab84a6
Re-enable legacy diff notes on merge request diffs
This re-enables legacy diff notes on the merge request diffs
This feature was not workig correctly after the Vue refactor
LegacyDiffNotes have no `position`, instead they only have a `line_code`
As an extra, this also re-enables commenting on legacy diffs.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873
2018-09-17 09:50:36 +01:00
Tim Zallmann 7e390dcc25 Added constants for Render values + Optimised for Loop 2018-08-13 11:55:30 +02:00
Fatih Acet fbf747194f Componentize diff lines and diff comments 2018-06-27 21:20:41 +00:00
Fatih Acet 4e734a9004
Implement MR diff notes autosave feature. 2018-06-22 22:16:46 +02:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00