Commit Graph

25 Commits

Author SHA1 Message Date
GitLab Bot 81151db6d6 Add latest changes from gitlab-org/gitlab@master 2024-04-19 18:14:03 +00:00
GitLab Bot 2389653f0e Add latest changes from gitlab-org/gitlab@master 2024-02-14 12:12:55 +00:00
GitLab Bot d4fcd1794e Add latest changes from gitlab-org/gitlab@master 2023-11-07 15:19:19 +00:00
GitLab Bot 12a224d5db Add latest changes from gitlab-org/gitlab@master 2023-08-15 15:10:07 +00:00
GitLab Bot ed50918678 Add latest changes from gitlab-org/gitlab@master 2022-11-02 12:11:04 +00:00
GitLab Bot 73507eaf1a Add latest changes from gitlab-org/gitlab@master 2022-08-25 12:12:20 +00:00
GitLab Bot 88bacc889f Add latest changes from gitlab-org/gitlab@master 2022-04-08 12:08:48 +00:00
GitLab Bot 584ccdaf68 Add latest changes from gitlab-org/gitlab@master 2022-02-03 12:18:57 +00:00
GitLab Bot 7f408a3831 Add latest changes from gitlab-org/gitlab@master 2021-04-14 12:09:25 +00:00
GitLab Bot 835f1214dc Add latest changes from gitlab-org/gitlab@master 2021-02-14 18:09:20 +00:00
GitLab Bot 27622f7417 Add latest changes from gitlab-org/gitlab@master 2020-08-24 15:10:11 +00:00
GitLab Bot 334fbbb5d3 Add latest changes from gitlab-org/gitlab@master 2020-05-16 06:07:58 +00:00
Natalia Tepluhina d4151b14c2 Rebased and squashed commits
- all commits squashed to make danger review happy
2019-07-03 08:26:57 +00:00
Mike Greiling 7ccd235df1
Upgrade prettier and reformat files as necessary
Upgrades prettier to 1.15.3
Runs `yarn prettier-save-all` against the codebase
Most changes are due to https://github.com/prettier/prettier/pull/5519
2019-01-14 15:29:02 -06:00
Oswaldo Ferreira ed3034bbb7 Allow suggesting single line changes in diffs 2018-12-13 19:17:19 +00:00
Mike Greiling 5b9495c5db
Prettify all the things 2018-11-20 09:30:01 -06:00
Fatih Acet cd5ddc4f2e Discussions redesign 2018-11-08 07:58:45 +00: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
Tim Zallmann d4d5ed59f9 Fixes based on MR discussion around naming, mutations, handling of state 2018-09-07 16:20:57 +02:00
Tim Zallmann 173ecfc42b Delete Discussions fix 2018-09-07 12:25:50 +02:00
André Luís 296f489d85 Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit e0fe97ca4a506405af8e85368f2c69cda637e192.
2018-08-01 15:26:57 +01:00
André Luís 8693aa139d Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit ced005f330, reversing
changes made to 9b01b293ce.
2018-08-01 13:45:15 +01:00
André Luís f2f8ddf4cc Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions" 2018-07-20 15:24:46 +00:00
Tim Zallmann 9eef6cd1bf Resolve "MR refactor: Performance costs of main element with `v-if`" 2018-07-09 11:54:15 +00:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00