summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42GitLab Bot2022-01-204-5/+56
|
* Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42GitLab Bot2021-12-202-1/+2
|
* Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42GitLab Bot2021-09-201-41/+1
|
* Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42GitLab Bot2021-08-191-1/+1
|
* Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42GitLab Bot2021-07-201-6/+5
|
* Add latest changes from gitlab-org/security/gitlab@14-0-stable-eeGitLab Bot2021-06-301-1/+1
|
* Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot2021-05-191-2/+3
|
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-204-7/+8
|
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-162-3/+4
|
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-183-7/+8
|
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-173-7/+9
|
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-195-31/+26
|
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-217-24/+18
|
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-191-0/+4
|
* Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot2020-08-204-4/+12
|
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-203-3/+5
|
* Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot2020-06-182-3/+3
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-152-2/+0
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-101-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-261-2/+2
|
* Format vue files with prettierMarcel van Remmerden2019-06-062-2/+2
| | | | Add changelog file
* Makes 'diff/content' partial use instance methodMayra Cabrera2019-05-211-1/+1
| | | | There's a method defined on viewer that does the conditional.
* Replaces CSS with utility class59841-show-commitsFilipa Lacerda2019-04-121-1/+1
|
* Fix old image diff swipe viewftab2019-04-052-3/+3
|
* Move swipe diff border to the rightftab2019-04-041-1/+1
| | | | | | | In the Vue image diff app, the border needs to be on the right because the new image comes in from the left. The old image diff app which is used in commits and compare views had the new image visible by default and hiding away from the left.
* Remove now-unnecessary noteable_line classDouwe Maan2019-03-262-3/+3
|
* Add .code to all tables holding diffsDouwe Maan2019-03-261-2/+2
| | | | | We need this to be able to distinguish between Markdown tables and diff tables.
* Correct file-header spacing on compare pageSam Bigelow2019-02-062-4/+4
| | | | | Use special classes when is_compare, similar to is_commit. Default expectation is diff is being viewed in MR
* Fix broken templated "Too many changes to show" textStan Hu2019-01-091-1/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23230 broke the external string in 11.6. This fixes that and adds a spec. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56138
* Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-271-5/+1
| | | | | | | | | | | This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812, fixes a problem creating a displaying image diff notes when the image is stored in LFS. The main problem was that `Gitlab::Diff::File` was returning an invalid valid in `text?` for this kind of files. It also fixes a rendering problem with other LFS files, like text ones. They LFS pointer shouldn't be shown when LFS is enabled for the project, but they were.
* Fixed UI bugs with sticky diff headerPhil Hughes2018-11-272-4/+5
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54503
* Externalize strings from `/app/views/projects/diffs`George Tsiolis2018-11-2014-22/+20
|
* Fix broken UI on commit discussionsAnnabel Dunstone Gray2018-11-131-1/+1
|
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-2/+2
| | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* Correct remaining `Lint/UselessAssignment` haml-lint violationsRobert Speicher2018-08-312-3/+0
|
* Escaped html charactersChantal Rollison2018-08-212-4/+4
|
* Resolve ""Click to expand" link in collapsed diffs should be blue"Annabel Gray2018-06-141-1/+1
|
* Fix hide whitespace changes buttonClement Ho2018-05-241-1/+1
|
* Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-101-1/+1
|
* Fix broken layout on compare branches pageAnnabel Dunstone Gray2018-05-091-1/+1
|
* Merge branch 'master' into bootstrap4Clement Ho2018-05-081-1/+1
|\
| * [Rails5] Use `safe_params` instead of `params` in `url_for` helpersblackst0ne2018-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix image diff view modesClement Ho2018-04-241-5/+5
| |
* | fix blobs edit specClement Ho2018-04-231-1/+1
| |
* | Fix diff stats sticky barClement Ho2018-04-182-2/+2
| |
* | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-181-1/+1
|\ \ | |/ | | | | | | # Conflicts: # app/views/projects/issues/_nav_btns.html.haml # app/views/projects/merge_requests/creations/_new_compare.html.haml
| * [Rails5] Add `safe_params` helperblackst0ne2018-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | Rails 5.0 requires to explicitly permit attributes when building a URL using current `params` object. The `safe_params` helper allows developers to just call `safe_params.merge(...)` instead of manually adding `permit` to every call. https://github.com/rails/rails/pull/20868
* | [skip ci] Convert .label. to .badge.Clement Ho2018-04-131-1/+1
| |
* | [skip ci] Replace hidden-xsClement Ho2018-04-092-4/+4
| |
* | [skip ci] Replace hidden-smClement Ho2018-04-092-2/+2
| |