summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
Commit message (Expand)AuthorAgeFilesLines
* Enable even more frozen string in lib/gitlabgfyoung2018-11-0620-1/+41
* Merge branch 'sh-optimize-reload-diffs-service' into 'master'Sean McGivern2018-11-021-2/+5
|\
| * Avoidp loading merge request diff files when not neededStan Hu2018-11-011-2/+5
* | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-011-1/+1
|\ \ | |/ |/|
| * Fix typos in comments and specsGeorge Tsiolis2018-11-011-1/+1
* | Make Highlight accept language paramMark Chao2018-10-301-1/+1
|/
* Merge branch '51958-fix-mr-discussion-loading' into 'master'Phil Hughes2018-10-041-0/+4
|\
| * Fix MR discussion not loaded issue51958-fix-mr-discussion-loadingMark Chao2018-10-011-0/+4
* | [master] Stored XSS in Gitlab Merge Request from imported repositoryFrancisco Javier López2018-10-011-1/+1
|/
* Simplify by using Gitlab::SafeRequestStoreMichael Kozono2018-09-241-12/+8
* Use standalone diff stats RPC on every comparison viewOswaldo Ferreira2018-09-193-6/+32
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-112-0/+6
* Cache diff highlighting upon Merge Request creation (refactors diff caching)Oswaldo Ferreira2018-09-073-49/+92
* Use a serializer to render diff linesFelipe Artur2018-08-311-9/+3
* Include rich_text in diff cache keysSean McGivern2018-08-281-3/+4
* Escaped html charactersChantal Rollison2018-08-212-2/+2
* Resolve Naming/UncommunicativeMethodLin Jen-Shin2018-07-092-5/+5
* Merge branch 'issue_48474' into 'master'Sean McGivern2018-07-051-0/+1
|\
| * Render LegacyDiffNote when diff_file blob is nilFelipe Artur2018-07-041-0/+1
* | Use serialize_keys as part of highlight diff cacheJan Provaznik2018-07-042-6/+4
* | Don't add bottom 'match' line for deleted filesJan Provaznik2018-06-281-1/+1
|/
* Changes tab VUE refactoringFelipe Artur2018-06-213-12/+60
* Adjust insufficient diff hunks being persisted on NoteDiffFileosw-ignore-diff-header-when-persisting-diff-hunkOswaldo Ferreira2018-06-052-3/+10
* Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-241-0/+7
* Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master'Douwe Maan2018-05-011-0/+2
|\
| * Use persisted diff data instead fetching Git on discussionsOswaldo Ferreira2018-04-301-0/+2
* | Merge request and commit discussions APIJan Provaznik2018-05-011-0/+4
|/
* Method to track recoverable exceptions in sentryBob Van Landuyt2018-04-171-4/+1
* Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-051-2/+5
* Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binarySean McGivern2018-03-161-18/+21
* Only cache MR diffs for one week44191-reduce-redis-usage-from-merge-request-diffs-cachingSean McGivern2018-03-151-1/+1
* Only cache highlight results for latest MR diffsSean McGivern2018-03-151-4/+8
* Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-121-1/+5
|\
| * Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-071-1/+5
* | Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffsOswaldo Ferreira2018-03-091-8/+10
|/
* Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-221-1/+11
* Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
* Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-041-8/+23
* Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_...Douwe Maan2017-12-221-1/+3
* Merge branch 'fix_39233' into 'master'Sean McGivern2017-12-071-1/+1
|\
| * fix #39233 - 500 in merge requestMartin Nowak2017-12-071-1/+1
* | add support for the commit reference filtermicael.bergeron2017-12-071-19/+3
|/
* Batchload blobs for diff generationZeger-Jan van de Weg2017-11-212-14/+9
* Adds Rubocop rule for line break after guard clauseJacopo2017-11-163-0/+3
* Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-301-3/+5
* Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-162-10/+1
|\
| * Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-1/+1
| * Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
| * Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-122-10/+1
* | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-151-1/+3
|/
View Lorry Controller Status