summaryrefslogtreecommitdiff
path: root/spec/javascripts/diffs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'diff-fix-folder-path-commas' into 'master'Filipa Lacerda2019-01-251-0/+52
|\ | | | | | | | | Fixed diff tree folders being rendered incorrectly See merge request gitlab-org/gitlab-ce!24635
| * Fixed diff tree folders being rendered incorrectlyPhil Hughes2019-01-241-0/+52
| |
* | Added dropdown for diff settingsPhil Hughes2019-01-245-83/+246
|/ | | | | | | 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
* Trim first char of diff line text on diff discussionsDouwe Maan2019-01-221-7/+2
| | | | | | | | | | | | 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.
* Resolve "Merge request file browser should always be possible show/hide"Sam Bigelow2019-01-221-2/+2
|
* Merge branch 'diff-tree-collapse-directories' into 'master'Filipa Lacerda2019-01-182-0/+141
|\ | | | | | | | | | | | | Collapses directory structure in merge request tree Closes #53069 See merge request gitlab-org/gitlab-ce!24392
| * Added specs for mutations & utils methodsPhil Hughes2019-01-162-0/+141
| |
* | Resolve "In Merge Request diff screen, master is not a hyperlink"Natalia Tepluhina2019-01-163-24/+67
|/
* Add headers to files in the tree list on merge requestsPhil Hughes2019-01-083-2/+24
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54807
* Fixed Data Attribute Test54981-extended-user-centric-tooltips-add-missing-casesTim Zallmann2019-01-061-1/+1
|
* Added Spec for Vue Commit ItemTim Zallmann2019-01-061-0/+2
|
* Merge branch ↵Phil Hughes2018-12-201-2/+18
|\ | | | | | | | | | | | | | | | | '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
| * Utilize :key to minimize extra rerendersSam Bigelow2018-12-171-2/+18
| | | | | | | | | | | | 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.
* | Merge branch 'inline-duplicated-discussions' into 'master'Fatih Acet2018-12-171-0/+65
|\ \ | |/ |/| | | | | | | | | Fixed duplicated inline diff discussions Closes #55388 See merge request gitlab-org/gitlab-ce!23843
| * Fixed duplicated inline diff discussionsPhil Hughes2018-12-141-0/+65
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55388
* | Merge branch '54786-mr-empty-file-display' into 'master'Nick Thomas2018-12-151-0/+39
|\ \ | |/ |/| | | | | | | | | Display empty files properly on MR diffs Closes #54786 See merge request gitlab-org/gitlab-ce!23671
| * Fix diff table rendering for empty files and improve testsSean Nichols2018-12-131-5/+13
| |
| * Add tests and move empty file message into own componentSean Nichols2018-12-131-0/+31
| |
* | Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-132-2/+14
| |
* | Fix diff changes empty statePhil Hughes2018-12-132-25/+107
| | | | | | | | | | | | | | | | | | 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
* | Added testPhil Hughes2018-12-121-0/+81
| |
* | Fixed notes not being applied to diff linesPhil Hughes2018-12-121-0/+4
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55248, https://gitlab.com/gitlab-org/gitlab-ce/issues/55245
* Resolve "Navigating unresolved discussions on Merge Request page"André Luís2018-12-081-0/+61
|
* Merge branch 'winh-merge-request-diff-discussion-commit-id' into 'master'Mike Greiling2018-12-072-10/+26
|\ | | | | | | | | Pass commit when posting diff discussions See merge request gitlab-org/gitlab-ce!23371
| * Pass commit when posting diff discussionsWinnie Hellmann2018-12-052-10/+26
| |
* | Remove unused data from discussions endpointOswaldo Ferreira2018-12-061-2/+0
| | | | | | | | | | | | | | 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.
* | Fixed renamed and mode changed diff viewersPhil Hughes2018-12-062-0/+48
|/ | | | | | | Renders mode changed and renamed file merge request diff viewers on the frontend. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607
* Merge branch 'diff-expand-commit-file' into 'master'Filipa Lacerda2018-12-051-14/+37
|\ | | | | | | | | | | | | Fixed expanding diff commit files Closes #50662 See merge request gitlab-org/gitlab-ce!23591
| * Fixed expanding diff commit filesPhil Hughes2018-12-051-14/+37
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50662
* | Fixed multiple discussions getting added to diff linesPhil Hughes2018-12-051-0/+78
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8195
* Merge branch 'expand-diff-bug' into 'master'Filipa Lacerda2018-12-051-1/+1
|\ | | | | | | | | | | | | Fixed diff files not expanding Closes #54868 See merge request gitlab-org/gitlab-ce!23555
| * Fixed diff files not expandingPhil Hughes2018-12-041-1/+1
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54868
* | Updated variable name to forceExpandedPhil Hughes2018-12-041-2/+2
| |
* | Fixed multiple diff line discussions not expandingPhil Hughes2018-12-041-0/+29
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600
* Resolve "Merge request refactor does not highlight selected line"Sam Bigelow2018-11-306-2/+198
|
* Improve discussion rendering performancePhil Hughes2018-11-275-103/+44
| | | | | | | | | | | 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
* Show toggle tree button on merge request commitsPhil Hughes2018-11-222-40/+21
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
* Rename diffs store variableGeorge Tsiolis2018-11-152-7/+7
|
* Made diff & note data consistentPhil Hughes2018-11-1415-423/+422
| | | | | | | | | | 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.
* Fix collapsed files not fully fully expandingPhil Hughes2018-11-131-0/+22
| | | | | | | This fixes files that are collapsed by default not expanding when the expand all button is clicked. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53866
* Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-121-2/+2
|\ | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-091-2/+2
| |
* | Changed diff tree filtering to pathPhil Hughes2018-11-121-1/+1
|/ | | | | | | Previously it was using name which could make it hard to filter for the file you want in a certain folder. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53781
* Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-071-2/+2
| | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
* Show expand all button on merge request diffsPhil Hughes2018-11-071-4/+4
| | | | | | | | This restores the behaviour of showing the expand all button on diffs even when only a single file is collapsed. Previously the button would only show when all files are collapsed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
* Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'Douwe Maan2018-11-071-2/+2
|\ | | | | | | | | Comment on any expanded diff line on MRs See merge request gitlab-org/gitlab-ce!22398
| * Comment on any expanded diff line on MRsOswaldo Ferreira2018-11-061-2/+2
| |
* | Restored width & height propertiesPhil Hughes2018-11-063-6/+43
| |
* | Re-implemented image commenting on diffsPhil Hughes2018-11-056-13/+257
|/ | | | | | | | | | | | | | | | | | | | | 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
* Fixes diff discussions not being fully removedmr-diff-discussion-deletionPhil Hughes2018-10-301-0/+1
| | | | | | | | | | | | This fixes a bug where a discussion on a none changed line would not get fully removed and therefore leave the comment row empty. This was caused by the discussiob being added to the right when it shouldnt of been This also fixes a very rare edge case where discussions would get added twice to diff lines causing a Vue rendering warning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53317
View Lorry Controller Status