Commit Graph

45 Commits

Author SHA1 Message Date
GitLab Bot 238494601c Add latest changes from gitlab-org/gitlab@master 2024-08-20 15:11:04 +00:00
GitLab Bot 1bd9d2d949 Add latest changes from gitlab-org/gitlab@master 2024-01-11 18:09:22 +00:00
GitLab Bot 2ff7b07dbc Add latest changes from gitlab-org/gitlab@master 2023-06-26 21:07:57 +00:00
GitLab Bot ad1e76fb4d Add latest changes from gitlab-org/gitlab@master 2023-03-01 18:07:43 +00:00
GitLab Bot 71722304be Add latest changes from gitlab-org/gitlab@master 2022-02-01 21:12:02 +00:00
GitLab Bot e303f963d0 Add latest changes from gitlab-org/gitlab@master 2021-12-17 15:13:39 +00:00
GitLab Bot acab9fc89c Add latest changes from gitlab-org/gitlab@master 2021-09-08 18:11:23 +00:00
GitLab Bot e2f984e14e Add latest changes from gitlab-org/gitlab@master 2021-09-08 12:12:01 +00:00
GitLab Bot ff490fb7df Add latest changes from gitlab-org/gitlab@master 2021-08-06 09:10:16 +00:00
GitLab Bot 111e0ef1fa Add latest changes from gitlab-org/gitlab@master 2021-06-16 12:10:18 +00:00
GitLab Bot 21e3c08612 Add latest changes from gitlab-org/gitlab@master 2021-04-14 00:10:39 +00:00
GitLab Bot a5605d87fb Add latest changes from gitlab-org/gitlab@master 2021-04-13 18:11:28 +00:00
GitLab Bot 7ad147d6b8 Add latest changes from gitlab-org/gitlab@master 2021-04-13 12:11:32 +00:00
GitLab Bot da07b341fd Add latest changes from gitlab-org/gitlab@master 2021-04-05 21:09:19 +00:00
GitLab Bot 4d6582cc54 Add latest changes from gitlab-org/gitlab@master 2021-04-03 00:09:02 +00:00
GitLab Bot b9c00e60c4 Add latest changes from gitlab-org/gitlab@master 2021-01-25 09:09:10 +00:00
GitLab Bot 442a79b733 Add latest changes from gitlab-org/gitlab@master 2021-01-19 12:10:46 +00:00
GitLab Bot 35aeb676e8 Add latest changes from gitlab-org/gitlab@master 2020-12-18 00:10:04 +00:00
GitLab Bot f96f2720d1 Add latest changes from gitlab-org/gitlab@master 2020-12-02 21:09:44 +00:00
GitLab Bot a928c5170f Add latest changes from gitlab-org/gitlab@master 2020-09-01 09:10:28 +00:00
GitLab Bot f0c0458b3c Add latest changes from gitlab-org/gitlab@master 2020-08-28 12:10:37 +00:00
GitLab Bot e65a1b9830 Add latest changes from gitlab-org/gitlab@master 2020-07-30 15:09:40 +00:00
GitLab Bot 833d57e60d Add latest changes from gitlab-org/gitlab@master 2020-07-08 15:09:24 +00:00
GitLab Bot 254ec28f54 Add latest changes from gitlab-org/gitlab@master 2020-04-09 21:09:19 +00:00
GitLab Bot c4db541c1b Add latest changes from gitlab-org/gitlab@master 2020-03-24 21:07:54 +00:00
GitLab Bot 967812838c Add latest changes from gitlab-org/gitlab@master 2020-03-23 18:09:25 +00:00
GitLab Bot 2c156e3c7b Add latest changes from gitlab-org/gitlab@master 2020-03-17 18:09:44 +00:00
GitLab Bot e3764d340e Add latest changes from gitlab-org/gitlab@master 2019-12-19 12:07:35 +00:00
GitLab Bot fc53ce8e6c Add latest changes from gitlab-org/gitlab@master 2019-12-12 09:07:48 +00:00
GitLab Bot 23d237110e Add latest changes from gitlab-org/gitlab@master 2019-11-26 09:08:36 +00:00
Phil Hughes d2fd6bd510
Added diff suggestion popover
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
2019-06-14 14:01:24 +01:00
Phil Hughes 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
Phil Hughes 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
Sam Bigelow 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
Phil Hughes 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
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
Sam Bigelow 44a0121ad4 Resolve "Merge request refactor does not highlight selected line" 2018-11-30 08:48:47 +00:00
Filipa Lacerda 822fa649eb Merge branch 'discussion-perf-fixes' into 'master'
Improve discussion rendering performance

Closes #51506

See merge request gitlab-org/gitlab-ce!22935
2018-11-28 09:45:36 +00:00
Phil Hughes 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
Winnie Hellmann 0bf740fa32 Replace `=== true` with `parseBoolean()` 2018-11-27 09:18:48 +01: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
André Luís 52cf955b89 Improve MR file tree on small screens 2018-10-11 23:33:38 +01: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
Paul Slaughter ae5600b868 Create specs for diffs/components/app and update modules to export factory functions 2018-09-14 08:25:13 +00:00
Filipa Lacerda adb7f45aff
Exports getters individually.
Exports state to allow tests
Adds specs for the getters that didn't have any.
2018-07-06 13:21:02 +01:00