summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' i...Douwe Maan2016-11-291-1/+1
|\
| * Don't use diff_line_content for emailsSean McGivern2016-11-281-1/+1
| * Don't remove + / - signs from diff emailsSean McGivern2016-11-281-1/+1
* | Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-281-1/+1
|/
* Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into 'mas...Sean McGivern2016-11-173-9/+11
|\
| * Unify anchor link format for MR diff files !7298Yar2016-11-153-9/+11
* | Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-1/+1
|/
* Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-101-1/+1
* Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran2016-11-091-2/+2
|\
| * Remove an extra leading space from diff contentHiroyuki Sato2016-11-041-2/+2
* | Add width to caret to rid ourselves of the shiftfixed-width-caretJacob Schatz2016-11-041-1/+1
|/
* Updated positioning of copy file path button in diffsmr-copy-filename-btn-updatePhil Hughes2016-10-312-1/+2
* Fix horizontal padding for highlight blocks23661-lacking-padding-on-syntax-highlight-blocks-in-diff-commentsLuke Bennett2016-10-251-1/+1
* Added copy file path button to diffsmr-file-path-copy-btnPhil Hughes2016-10-101-1/+1
* MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-061-1/+2
* Merge branch '22343-honor-user-fixed-layout-pref' into 'master' Fatih Acet2016-10-041-2/+0
|\
| * ensure the 'fixed layout' preference is honored whenever possibleMike Greiling2016-09-201-2/+0
* | Merge branch '21369-make-it-clearer-that-diffs-can-be-collapsed' into 'master' Jacob Schatz2016-10-012-1/+4
|\ \
| * | Updated diff toggle targets and added iconLuke Bennett2016-09-032-1/+4
| |/
* | fix typo "this files" -> "this file"Mike Greiling2016-09-291-1/+1
* | Style merge request diff dropdowns & disable comments.Bryce Johnson2016-09-141-1/+1
|/
* Fix expansion of discussions in diffdiff-line-comment-vuejsDouwe Maan2016-08-182-4/+2
* Improve performance of MR show pageDouwe Maan2016-08-182-10/+16
* Merge branch '20454-edit-button-mr' into 'master' Douwe Maan2016-08-181-4/+3
|\
| * edit_blob_link can receive the blob to avoid access to the repository20454-edit-button-mrPaco Guzman2016-08-181-4/+3
* | Fix email line-height in Outlookoutlook-email-spacingSean McGivern2016-08-171-1/+6
|/
* Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_dataPaco Guzman2016-08-101-1/+1
* Merge branch 'side-by-side-unfold' into 'master' Douwe Maan2016-08-056-18/+11
|\
| * Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-046-18/+11
* | Fix Mystery GuestHerminio Torres2016-08-042-3/+3
|/
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-7/+7
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-3/+4
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-1/+1
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-033-5/+3
* Avoid line_code and position calculation on line partial for plain view14202-avoid-line-code-position-calculationsPaco Guzman2016-08-011-4/+3
* Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-291-4/+5
* Bump gitlab_git to speedup DiffCollection iterationsPaco Guzman2016-07-292-2/+2
* Fix expand all diffs button in compare view20241-expand-all-button-breaks-diff-comparison-viewSean McGivern2016-07-261-1/+1
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-203-31/+30
* Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-182-6/+6
* Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-114-28/+32
|\
| * Support renames in diff_for_path actionsSean McGivern2016-07-111-1/+1
| * Make expand_all param more explicitSean McGivern2016-07-082-3/+3
| * Allow expanding all diffs at onceSean McGivern2016-07-082-1/+3
| * Ensure only renderable text diffs are collapsedSean McGivern2016-07-082-7/+6
| * Disable overflow messagesSean McGivern2016-07-082-9/+1
| * Collapse large diffs by defaultSean McGivern2016-07-082-25/+31
* | Registered FilesCommentButton as a jQuery plugin and made review changesLuke "Jared" Bennett2016-07-081-2/+2
* | Merge branch 'master' into faster-diffsDouwe Maan2016-07-077-68/+72
|\ \ | |/
| * Use HAML class syntax in diff line partialsDouwe Maan2016-07-072-5/+5
View Lorry Controller Status