summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-201-0/+1
|\
| * Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+1
* | updated to use new sprite iconsPhil Hughes2017-11-171-3/+3
|/
* Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-021-7/+9
* Merge branch 'master' into ideMike Greiling2017-08-071-0/+18
|\
| * Moved changed files into a dropdownPhil Hughes2017-08-031-0/+18
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-311-1/+1
|\ \ | |/
| * Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inlineSean McGivern2017-07-281-1/+1
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-201-7/+7
|\ \ | |/
| * Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-7/+7
* | Merge remote-tracking branch 'origin/master' into dm-tree-jsonDmitriy Zaporozhets2017-06-221-6/+30
|\ \ | |/
| * Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-191-2/+2
| * Implement diff viewersDouwe Maan2017-06-141-0/+24
| * Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-011-2/+2
| |\
| | * Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov2017-05-311-2/+2
| * | Consistent diff and blob size limit namesDouwe Maan2017-05-291-4/+4
| |/
* | Add experimental JSON format for tree controllerDouwe Maan2017-05-261-4/+4
|/
* Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-231-20/+4
* Clean up diff renderingDouwe Maan2017-05-231-4/+20
* Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-231-2/+2
* Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-121-2/+2
* Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
* Fix specsDouwe Maan2017-04-091-0/+2
* Correctly display multiple separate discussions on the same diff lineDouwe Maan2017-04-051-4/+4
* Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-121-0/+6
* Merge branch 'html-safe-diff-line-content' into 'security' Robert Speicher2016-12-081-1/+3
* Remove an extra leading space from diff contentHiroyuki Sato2016-11-041-4/+3
* Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_dataPaco Guzman2016-08-101-3/+2
* Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-14/+25
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-4/+1
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-1/+1
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-6/+5
* Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-291-2/+0
|\
| * Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-191-2/+0
* | Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-7/+9
|/
* Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-4/+5
* Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-111-9/+11
|\
| * Support renames in diff_for_path actionsSean McGivern2016-07-111-2/+6
| * Make expand_all param more explicitSean McGivern2016-07-081-2/+2
| * DRY up diff_for_path actionsSean McGivern2016-07-081-21/+3
| * Allow expanding all diffs at onceSean McGivern2016-07-081-0/+4
| * Ensure only renderable text diffs are collapsedSean McGivern2016-07-081-0/+1
| * Disable overflow messagesSean McGivern2016-07-081-9/+1
| * Collapse large diffs by defaultSean McGivern2016-07-081-0/+19
* | Merge branch 'master' into faster-diffsDouwe Maan2016-07-071-8/+7
|\ \ | |/
| * Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-061-1/+3
| * Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-061-4/+0
| * Add DiffFile#blob and #old_blobDouwe Maan2016-07-061-2/+3
| * Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-2/+2
* | fix up testsLuke "Jared" Bennett2016-07-061-1/+1
|/
View Lorry Controller Status