Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
AgeCommit message (Collapse)Author
2017-03-13take nonewline context into account in diff parsermhasbini
2017-02-23Fix code for copsDouwe Maan
2017-02-23Enable Style/ConditionalAssignmentDouwe Maan
2017-02-23Enable Performance/RedundantMatchDouwe Maan
2017-02-23Enable Style/MutableConstantDouwe Maan
2017-02-13Enable `Lint/EmptyWhen` cop and correct offenseRobert Speicher
2016-12-26Fix MR with files hidden by .gitattributesSean McGivern
Don't try to highlight and cache files hidden by .gitattributes entries.
2016-12-02Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClassValery Sizov
2016-11-25Fix: Timeout creating and viewing merge request for binary fileValery Sizov
2016-11-14Fix Error 500 when creating a merge request that contains an image that was ↵Stan Hu
deleted and added Steps to reproduce: 1. Start with a repo with an image 2. Add a commit to delete the image 3. Add another commit to replace the image with another image In a diff comparison, we really just compare about what the image was before the diff, not the direct parent of the last commit. This MR fixes that. Closes #3893, gitlab-org/gitlab-ee#678 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-10Fix expanding a collapsed diff when converting a symlink to a regular fileAdam Niedzielski
In this case comparing old_path and new_path is not enough because there are two entires that match.
2016-10-17Fix the diff in the merge request view when converting a symlink to a ↵Adam Niedzielski
regular file. In this specific case using file_path as a cache key is not enough, because there are two entries with the same path. Closes #21610.
2016-08-22Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-19Fix line commenting for the initial commitSean McGivern
The initial commit doesn't have a parent, so explicitly pass the blank SHA and handle that when calculating the position.
2016-08-19Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-15Make merge request diff works with new FileCollection logicDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-12Fix specsSean McGivern
- Add match line header to expected result for `File#sections`. - Lowercase CSS colours. - Remove unused `diff_refs` keyword argument. - Rename `parent` -> `parent_file`, to be more explicit. - Skip an iteration when highlighting.
2016-08-12Auto-highlight conflict when rich_text is calledSean McGivern
2016-08-12Add backend for merge conflicts readingSean McGivern
2016-08-03switch from diff_file_collection to diffsPaco Guzman
So we have raw_diffs too
2016-08-03Introduce Compare model in the codebase.Paco Guzman
This object will manage Gitlab::Git::Compare instances
2016-08-03Move to Gitlab::Diff::FileCollectionPaco Guzman
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
2016-08-03Cache highlighted diff lines for merge requestsPaco Guzman
Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
2016-07-29Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher
Enable Rubocop cops that check access modifiers ## What does this MR do? This MR enables Rubocop cops that detect methods that should be restricted but are the part of public API because of access modifiers used improperly. This also fixes existing offenses. ## Why was this MR needed? Some method in our codebase are public instead of being private because it is sometimes difficult to get it right without static analysis. ## What are the relevant issue numbers? See #17478 Closes #17372 See merge request !5014
2016-07-21Add Discussion model to represent MR/diff discussionDouwe Maan
2016-07-20Ensure to_json methods take optional argumentSean McGivern
2016-07-19Fix method visibility in inline diff classGrzegorz Bizon
2016-07-18Collapsed diffs lines/size don't accumulate to overflow diffs.Paco Guzman
2016-07-13Merge branch 'better-parallel-diff' into 'master' Robert Speicher
Actually render old and new sections of parallel diff next to each other See merge request !5173
2016-07-13Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan
Render inline diffs for multiple changed lines following eachother Before: ![Screen_Shot_2016-07-11_at_00.08.27](/uploads/b14664211e0f5cef6e77a78eadfcbcdf/Screen_Shot_2016-07-11_at_00.08.27.png) After: ![Screen_Shot_2016-07-11_at_00.07.34](/uploads/567be631869a4867a2edf6ff7eda6369/Screen_Shot_2016-07-11_at_00.07.34.png) See merge request !5174
2016-07-13Actually render old and new sections of parallel diff next to each otherDouwe Maan
2016-07-13Rename constant to be more descriptiveDouwe Maan
2016-07-12Extended regexes ignore whitespace, so use \sDouwe Maan
2016-07-12Render inline diffs for multiple changed lines following eachotherDouwe Maan
2016-07-08Collapse large diffs by defaultSean McGivern
When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
2016-07-07Remove duplication, unused methods, and some other style thingsDouwe Maan
2016-07-07Add some more code comments.Douwe Maan
2016-07-07Display new diff notes and allow creation through the web interfaceDouwe Maan
2016-07-07Add Gitlab::Git::PositionTracerDouwe Maan
2016-07-07Add Gitlab::Diff::LineMapperDouwe Maan
2016-07-07Add Gitlab::Git::PositionDouwe Maan
2016-07-07Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵Douwe Maan
responsibility to other classes
2016-07-07Style diff and blob file headers the same wayDouwe Maan
2016-07-07Add DiffFile#blob and #old_blobDouwe Maan
2016-07-07Represent DiffRefs as proper class instead of tuple arrayDouwe Maan
2016-07-01Enable Style/EmptyLines cop, remove redundant onesGrzegorz Bizon
2016-06-01Add leading comment space copFelipe Artur
2016-05-18Reuse existing SCSS variablesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler
Gitlab::Diff::InlineDiff
2016-05-11Enable the StringReplacement cop.Connor Shea
Also fix one use of `gsub` that would be faster as `delete`. Use `tr` instead of `gsub` when you are replacing the same number of characters. Use `delete` instead of `gsub` when you are deleting characters.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 15:35:16 +0300