summaryrefslogtreecommitdiff
path: root/spec/javascripts/diffs
Commit message (Collapse)AuthorAgeFilesLines
* Added diff suggestion popoverPhil Hughes2019-06-143-3/+49
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
* User link styling for commitsMarcel van Remmerden2019-06-101-1/+1
|
* Fix whitespace changes visibility when the related file was initially collapsedOndřej Budai2019-06-051-5/+6
|
* Remove unused avatar sizes62429-remove-unused-avatar-sizesAnnabel Dunstone Gray2019-05-311-2/+2
| | | | - Update avatars to use only sizes from the 8px grid
* Rename vue_component_helper to text_helperfe-rename-vue-component-helper-cePaul Slaughter2019-05-161-1/+1
| | | | | | **Why?** This file only contains a few text based helper functions. It has nothing to do with Vue or Vue components.
* Fixes issues with show whitespace button in diffsPhil Hughes2019-05-101-1/+29
| | | | | | | 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
* Impove the performance of expanding full diffPhil Hughes2019-05-034-20/+181
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597
* Extract discussion notes into new componentPaul Gascou-Vaillancourt2019-05-011-49/+62
| | | | | | | | | - Moved discussion notes out of `NoteableDiscussion` component into a new `DiscussionNotes` component - Wrote Jest tests for the new `DiscussionNotes` component - Updated Jest config for emojis fixtures - Updated Karma tests `NoteableDiscussion` to match its new structure - Convert `DiffDiscussions` tests to use Vue test utils
* Fix showing HTML content in view file tooltip60533-tooltip-for-view-file-shows-raw-htmlFatih Acet2019-04-161-0/+3
|
* Fixed fluid layout preference not being respected in diffsPhil Hughes2019-04-121-0/+8
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* Improve diff navigation headerSam Bigelow2019-04-053-2/+40
| | | | | | | | | | | | | | - 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
* Fixes duplicate diff too large error messagesPhil Hughes2019-04-021-5/+3
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
* Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'Clement Ho2019-04-011-1/+70
|\ | | | | | | | | | | | | Fix bug where clicking file header in diff refreshes page Closes #57669 See merge request gitlab-org/gitlab-ce!26422
| * Scroll to diff file when clicking on file name57669-fix-bug-clicking-file-header-refreshes-pageSam Bigelow2019-03-291-1/+70
| | | | | | | | | | | | - Add an ID to the diff content - handle clicking on file name in diffFileHeader when it is not a link to another page but rather a link to an element on the page
* | Remove expand diff to full file feature flagPhil Hughes2019-03-261-3/+0
| |
* | Remove now-unnecessary noteable_line classDouwe Maan2019-03-261-1/+1
|/
* Move some tests from Karma to JestWinnie Hellmann2019-03-234-182/+0
|
* Collapse diff tree is only one file is presentPhil Hughes2019-03-192-0/+65
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53139
* Fix expand all button not workingPhil Hughes2019-03-113-2/+55
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
* Add option to expand diff to full filePhil Hughes2019-03-065-1/+304
| | | | | | The user can also toggle between the diff changes and the full file diff. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
* CE backport of batch-comments-ee-store-modulePhil Hughes2019-03-044-4/+8
|
* Resolve "Add missing karma tests to the the MR Diff components"Natalia Tepluhina2019-02-286-21/+428
|
* Set up basic keyboard next/previous navigation in diff listDenys Mishunov2019-02-273-36/+227
| | | | | | | | | | | | 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()
* Merge branch 'fix-diffs-not-rendering' into 'master'Filipa Lacerda2019-02-182-3/+9
|\ | | | | | | | | Fix diff files not rendering See merge request gitlab-org/gitlab-ce!25358
| * Fix diff files not renderingPhil Hughes2019-02-182-3/+9
| | | | | | | | | | | | | | 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
* | Merge branch 'diff-tree-resizable' into 'master'Filipa Lacerda2019-02-182-1/+37
|\ \ | |/ |/| | | | | | | | | Make the file tree in merge requests resizable Closes #51857 See merge request gitlab-org/gitlab-ce!25097
| * Make the file tree in merge requests resizablePhil Hughes2019-02-152-1/+37
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51857
* | Replaced part of diff file properties with diff viewerNatalia Tepluhina2019-02-159-46/+78
|/ | | | | | - replaced file.too_large - replaced file.text - replaced file.collapsed
* Fixed diff rendering causing a duplicate key warningPhil Hughes2019-02-131-9/+23
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56797
* Merge branch ↵Phil Hughes2019-02-074-6/+41
|\ | | | | | | | | | | | | | | | | '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
| * Clearly display diff statistics for MRs52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-viewSam Bigelow2019-02-064-6/+41
| | | | | | | | | | Put the statistics in the compare-versions header for the entire MR Put them in the file header for each individual file
* | Added fuzzy file finder to merge requestsPhil Hughes2019-02-052-22/+5
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* 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
| |
View Lorry Controller Status