| Age | Commit message (Collapse) | Author |
|---|
|
Use special classes when is_compare, similar to is_commit. Default
expectation is diff is being viewed in MR
|
|
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54503
|
|
|
|
|
|
|
|
|
|
|
|
This commits replaces `params` with `safe_params` in `url_for` helpers
to resolve security issues [1] and failing specs with the
```
ArgumentError:
Attempting to generate a URL from non-sanitized request parameters!
An attacker can inject malicious data into the generated URL, such as
changing the host. Whitelist and sanitize passed parameters to be secure.
```
error.
[1]: https://gitlab.com/gitlab-org/gitlab-ce/issues/45168
|
|
|
|
|
|
|
|
|
|
Closes #36479
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.
Inspired by #24010 and !7298
|
|
|
|
see #22343 for issue description
|
|
Add unfold links for Side-by-Side view
## What does this MR do?
Add unfold links for Side-by-Side view and refactor some diff related code
## What are the relevant issue numbers?
Closes #3877
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5415
|
|
|
|
Magic Variable - Change the name of the variable to assign the local variable for partial, rather than `i` use the `index`.
Don't pass a local variable called `i` to a partial.
|
|
So we have raw_diffs too
|
|
This object will manage Gitlab::Git::Compare instances
|
|
Introducing the concept of SafeDiffs which relates
diffs with UI highlighting.
|
|
We can't reuse the existing value of the format parameter, because on
the merge request page that's 'json', so the link would go to a JSON
file. We can't set it to HTML, because that adds '.html' the URL, which
breaks the compare view (and looks bad). Setting it to nil uses the
default format, which in all of these cases is HTML anyway.
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# app/helpers/notes_helper.rb
# app/views/projects/diffs/_line.html.haml
# app/views/projects/diffs/_parallel_view.html.haml
# app/views/projects/diffs/_text_file.html.haml
# features/steps/shared/diff_note.rb
|
|
|
|
|
|
|
|
|
|
|
|
Toggle whitespace button for compare page
## What does this MR do?
Adds whitespace button to compare branches page.
## Are there points in the code the reviewer needs to double check?
Ruby code.
## Why was this MR needed?
Compare branches UX
## What are the relevant issue numbers?
Closes #17881.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4569
|
|
mark
Here was the problem:
1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file.
2. If the blob is text, GitLab will attempt to display it.
3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters.
4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT.
To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires
an update to gitlab_git: gitlab-org/gitlab_git!86
Closes #13826
|
|
compare path with the selected whitespace params
Updated CHANGELOG
Moved CHANGELOG entry
|
|
|
|
|
|
|
|
|
|
|
