summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs
Commit message (Expand)AuthorAgeFilesLines
* Fixes duplicate diff too large error messagesPhil Hughes2019-04-021-4/+0
* Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'Clement Ho2019-04-012-15/+45
|\
| * Scroll to diff file when clicking on file name57669-fix-bug-clicking-file-header-refreshes-pageSam Bigelow2019-03-292-15/+45
* | Remove expand diff to full file feature flagPhil Hughes2019-03-261-4/+1
* | Add .code to all tables holding diffsDouwe Maan2019-03-261-28/+26
|/
* Resolve "Code in other column of side-by-side diff is highlighted when select...Natalia Tepluhina2019-03-251-2/+2
* Merge branch '53139-hide-tree-single-file' into 'master'Filipa Lacerda2019-03-193-8/+18
|\
| * Collapse diff tree is only one file is presentPhil Hughes2019-03-193-8/+18
* | Remove diff tree filtering feature flagPhil Hughes2019-03-181-34/+18
|/
* Fix expand all button not workingPhil Hughes2019-03-115-4/+28
* Merge branch 'expand-diff-to-full-file' into 'master'Douwe Maan2019-03-077-9/+183
|\
| * Add option to expand diff to full filePhil Hughes2019-03-067-9/+183
* | CE backport of ee-parallel-diff-viewPhil Hughes2019-03-042-0/+11
|/
* CE backport of batch-comments-ee-store-modulePhil Hughes2019-03-042-0/+15
* CE port of noteable-discussion-ee-differencesPhil Hughes2019-02-281-1/+3
* Resolve "Add missing karma tests to the the MR Diff components"Natalia Tepluhina2019-02-282-9/+8
* Set up basic keyboard next/previous navigation in diff listDenys Mishunov2019-02-273-3/+41
* Merge branch 'fix-diffs-not-rendering' into 'master'Filipa Lacerda2019-02-182-5/+6
|\
| * Fix diff files not renderingPhil Hughes2019-02-182-5/+6
* | Merge branch 'diff-tree-resizable' into 'master'Filipa Lacerda2019-02-184-3/+55
|\ \ | |/ |/|
| * Make the file tree in merge requests resizablePhil Hughes2019-02-154-3/+55
* | Replaced part of diff file properties with diff viewerNatalia Tepluhina2019-02-156-53/+73
|/
* Fixed diff rendering causing a duplicate key warningPhil Hughes2019-02-132-0/+2
* Adds a feature flag to the diff fuzzy file finderPhil Hughes2019-02-081-13/+57
* Merge branch '52347-lines-changed-statistics-is-not-easily-visible-in-mr-chan...Phil Hughes2019-02-075-11/+75
|\
| * Clearly display diff statistics for MRs52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-viewSam Bigelow2019-02-065-11/+75
* | Added fuzzy file finder to merge requestsPhil Hughes2019-02-058-55/+103
|/
* Merge branch 'diff-fix-folder-path-commas' into 'master'Filipa Lacerda2019-01-251-2/+3
|\
| * Fixed diff tree folders being rendered incorrectlyPhil Hughes2019-01-241-2/+3
* | Added dropdown for diff settingsPhil Hughes2019-01-249-98/+143
|/
* Merge branch 'dm-trim-discussion-truncated-line-first-chars' into 'master'Phil Hughes2019-01-231-3/+7
|\
| * Trim first char of diff line text on diff discussionsDouwe Maan2019-01-221-3/+7
* | Merge branch '56327-improve-localtimeago-rendering' into 'master'Kushal Pandya2019-01-221-1/+1
|\ \ | |/ |/|
| * Remove reference to unused js-timeago-render classLukas Eipert2019-01-221-1/+1
* | Resolve "Merge request file browser should always be possible show/hide"Sam Bigelow2019-01-221-4/+14
|/
* Merge branch 'diff-tree-collapse-directories' into 'master'Filipa Lacerda2019-01-186-8/+97
|\
| * Collapses directory structure in merge request treePhil Hughes2019-01-156-8/+97
* | Resolve "In Merge Request diff screen, master is not a hyperlink"Natalia Tepluhina2019-01-162-6/+12
* | Merge branch 'mg-upgrade-prettier-again' into 'master'Clement Ho2019-01-156-9/+9
|\ \ | |/ |/|
| * Upgrade prettier and reformat files as necessaryMike Greiling2019-01-146-9/+9
* | Add syntax highlighting to suggestion previewJacques Erasmus2019-01-153-0/+8
|/
* Add headers to files in the tree list on merge requestsPhil Hughes2019-01-083-11/+37
* Dryed code in commit_item by adding another computed propTim Zallmann2019-01-071-9/+8
* Added User Popovers to Commit Items and Member ListsTim Zallmann2019-01-041-1/+19
* Fix commit SHA not showing in merge request compare dropdownStan Hu2018-12-311-1/+1
* Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-271-1/+7
* Merge branch '51606-expanding-a-diff-while-having-an-open-comment-form-will-a...Phil Hughes2018-12-203-3/+14
|\
| * Utilize :key to minimize extra rerendersSam Bigelow2018-12-173-3/+14
* | Merge branch 'inline-duplicated-discussions' into 'master'Fatih Acet2018-12-171-1/+1
|\ \ | |/ |/|
| * Fixed duplicated inline diff discussionsPhil Hughes2018-12-141-1/+1