- 26 Dec, 2016 1 commit
-
-
Sean McGivern authored
Don't try to highlight and cache files hidden by .gitattributes entries.
-
- 02 Dec, 2016 1 commit
-
-
Valery Sizov authored
-
- 28 Nov, 2016 1 commit
-
-
Sean McGivern authored
-
- 25 Nov, 2016 3 commits
-
-
hhoopes authored
* Added keyword arguments to truncated_diff_lines method to allow for using highlighting or not (html templates vs. text) * Tweaked templates for consistency and format appropriateness
-
hhoopes authored
Previously the `truncated_diff_lines` method for outputting a discussion diff took in already highlighted lines, which meant it wasn't reuseable for truncating ANY lines. In the way it was used, it also meant that for any email truncation, the whole diff was being highlighted before being truncated, meaning wasted time highlighting lines that wouldn't even be used (granted, they were being memoized, so perhaps this wasn't that great of an issue). I refactored truncation away from highlighting, in order to truncate formatted diffs for text templates in email, using `>`s to designate each line, but otherwise retaining the parsing already done to create `diff_lines`. Additionally, while notes on merge requests or commits had already been tested, there was no existing test for notes on a diff on an MR or commit. Added mailer tests for such, and a unit test for truncating diff lines.
-
Valery Sizov authored
-
- 14 Nov, 2016 1 commit
-
-
Stan Hu authored
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>
-
- 10 Nov, 2016 1 commit
-
-
Adam Niedzielski authored
In this case comparing old_path and new_path is not enough because there are two entires that match.
-
- 17 Oct, 2016 1 commit
-
-
Adam Niedzielski authored
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.
-
- 19 Aug, 2016 1 commit
-
-
Sean McGivern authored
The initial commit doesn't have a parent, so explicitly pass the blank SHA and handle that when calculating the position.
-
- 15 Aug, 2016 1 commit
-
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 12 Aug, 2016 3 commits
-
-
Sean McGivern authored
- 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.
-
Sean McGivern authored
-
Sean McGivern authored
-
- 03 Aug, 2016 4 commits
-
-
Paco Guzman authored
So we have raw_diffs too
-
Paco Guzman authored
This object will manage Gitlab::Git::Compare instances
-
Paco Guzman authored
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
-
Paco Guzman authored
Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
-
- 20 Jul, 2016 2 commits
-
-
Douwe Maan authored
-
Sean McGivern authored
-
- 19 Jul, 2016 1 commit
-
-
Grzegorz Bizon authored
-
- 18 Jul, 2016 1 commit
-
-
Paco Guzman authored
-
- 13 Jul, 2016 2 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
- 12 Jul, 2016 1 commit
-
-
Douwe Maan authored
-
- 11 Jul, 2016 1 commit
-
-
Douwe Maan authored
-
- 08 Jul, 2016 1 commit
-
-
Sean McGivern authored
When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
-
- 06 Jul, 2016 10 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
Extract parts of LegacyDiffNote into DiffOnNote concern and move part of responsibility to other classes
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
- 01 Jul, 2016 1 commit
-
-
Grzegorz Bizon authored
-
- 03 Jun, 2016 2 commits
-
-
James Lopez authored
This reverts commit 3e991230.
-
James Lopez authored
# Conflicts: # app/models/project.rb
-