985af1a670
take nonewline context into account in diff parser
2017-03-13 22:09:43 +02:00
5c7f9d69e3
Fix code for cops
2017-02-23 09:31:57 -06:00
8a4d68c53e
Enable Style/ConditionalAssignment
2017-02-23 09:31:57 -06:00
ccbebbdfeb
Enable Performance/RedundantMatch
2017-02-23 09:31:57 -06:00
b7d8df503c
Enable Style/MutableConstant
2017-02-23 09:31:56 -06:00
17c8d15b14
Enable `Lint/EmptyWhen` cop and correct offense
2017-02-13 11:00:20 -05:00
1e5e56c698
Fix MR with files hidden by .gitattributes
...
Don't try to highlight and cache files hidden by .gitattributes entries.
2016-12-26 16:25:55 +00:00
f5d7a61760
Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass
2016-12-02 14:03:30 +02:00
847ada36c4
Fix: Timeout creating and viewing merge request for binary file
2016-11-25 15:25:01 +02:00
0f61bb2dc5
Fix Error 500 when creating a merge request that contains an image that was 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-14 15:57:01 +01:00
3fa265d195
Fix expanding a collapsed diff when converting a symlink to a regular file
...
In this case comparing old_path and new_path is not enough because there
are two entires that match.
2016-11-10 18:24:12 +01:00
317e48193f
Fix the diff in the merge request view when converting a symlink to a 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-10-17 18:09:34 +02:00
9329436deb
Merge branch 'master' into dz-merge-request-version
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-22 11:34:41 +03:00
4a4c1765be
Fix line commenting for the initial commit
...
The initial commit doesn't have a parent, so explicitly pass the blank
SHA and handle that when calculating the position.
2016-08-19 16:35:44 +01:00
6db65143db
Merge branch 'master' into dz-merge-request-version
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-19 13:01:58 +03:00
643a368fa4
Make merge request diff works with new FileCollection logic
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-15 17:57:19 +03:00
261d47bce9
Fix specs
...
- 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-12 23:24:46 +03:00
7af277f683
Auto-highlight conflict when rich_text is called
2016-08-12 23:24:43 +03:00
df2ed097b7
Add backend for merge conflicts reading
2016-08-12 23:24:43 +03:00
c86c1905b5
switch from diff_file_collection to diffs
...
So we have raw_diffs too
2016-08-03 07:00:20 +02:00
1d0c7b7492
Introduce Compare model in the codebase.
...
This object will manage Gitlab::Git::Compare instances
2016-08-03 07:00:20 +02:00
8f359ea917
Move to Gitlab::Diff::FileCollection
...
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
2016-08-03 07:00:20 +02:00
cd7c2cb6dd
Cache highlighted diff lines for merge requests
...
Introducing the concept of SafeDiffs which relates
diffs with UI highlighting.
2016-08-03 07:00:19 +02:00
34c083a184
Merge branch 'rubocop/enable-access-modifiers-cops' into 'master'
...
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-29 15:58:09 +00:00
79214be727
Add Discussion model to represent MR/diff discussion
2016-07-20 16:18:18 -06:00
4f0780cc04
Ensure to_json methods take optional argument
2016-07-20 11:14:06 +01:00
20a5033d79
Fix method visibility in inline diff class
2016-07-19 15:12:14 +02:00
a404ab380d
Collapsed diffs lines/size don't accumulate to overflow diffs.
2016-07-18 14:43:28 -06:00
9b0ef1559f
Merge branch 'better-parallel-diff' into 'master'
...
Actually render old and new sections of parallel diff next to each other
See merge request !5173
2016-07-13 18:10:01 +00:00
5fea640e90
Merge branch 'multi-line-inline-diff' into 'master'
...
Render inline diffs for multiple changed lines following eachother
Before:
After:
See merge request !5174
2016-07-13 05:29:49 +00:00
545a85dc64
Actually render old and new sections of parallel diff next to each other
2016-07-13 00:04:07 -05:00
489e193704
Rename constant to be more descriptive
2016-07-13 00:02:20 -05:00
e981d6cd0d
Extended regexes ignore whitespace, so use \s
2016-07-12 11:25:39 -05:00
f5cc3f63a8
Render inline diffs for multiple changed lines following eachother
2016-07-11 18:58:15 -05:00
b6b26692ea
Collapse large diffs by default
...
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-08 10:56:55 +01:00
ac26b23712
Remove duplication, unused methods, and some other style things
2016-07-06 19:29:41 -04:00
228d2a4cb1
Add some more code comments.
2016-07-06 19:28:13 -04:00
29d574868a
Display new diff notes and allow creation through the web interface
2016-07-06 18:51:00 -04:00
db65954d78
Add Gitlab::Git::PositionTracer
2016-07-06 18:50:59 -04:00
e9e06ca627
Add Gitlab::Diff::LineMapper
2016-07-06 18:50:59 -04:00
9abcc0a98f
Add Gitlab::Git::Position
2016-07-06 18:50:59 -04:00
a27462a5c6
Extract parts of LegacyDiffNote into DiffOnNote concern and move part of responsibility to other classes
2016-07-06 18:50:59 -04:00
375193455a
Style diff and blob file headers the same way
2016-07-06 18:50:59 -04:00
9fc0e11e0d
Add DiffFile#blob and #old_blob
2016-07-06 18:50:58 -04:00
a9fa45f09e
Represent DiffRefs as proper class instead of tuple array
2016-07-06 18:50:58 -04:00
9e211091a8
Enable Style/EmptyLines cop, remove redundant ones
2016-07-01 21:56:17 +02:00
56f3b243ce
Add leading comment space cop
2016-05-31 19:33:46 -03:00
5341b16fc9
Reuse existing SCSS variables
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 13:20:46 -05:00
8a8b5497c5
Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff
2016-05-18 11:15:10 -05:00
4995302df6
Enable the StringReplacement cop.
...
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.
2016-05-10 18:34:15 -06:00
mhasbini
Douwe Maan
Robert Speicher
Sean McGivern
Valery Sizov
Stan Hu
Adam Niedzielski
Dmitriy Zaporozhets
Paco Guzman
Robert Speicher
Grzegorz Bizon
Douwe Maan
Felipe Artur
Rémy Coutable
Adam Butler
Connor Shea