Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42 | GitLab Bot | 2020-12-17 | 3 | -7/+9 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42 | GitLab Bot | 2020-11-19 | 5 | -31/+26 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42 | GitLab Bot | 2020-10-21 | 7 | -24/+18 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-4-stable-ee | GitLab Bot | 2020-09-19 | 1 | -0/+4 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-3-stable-ee | GitLab Bot | 2020-08-20 | 4 | -4/+12 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-2-stable-ee | GitLab Bot | 2020-07-20 | 3 | -3/+5 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-1-stable-ee | GitLab Bot | 2020-06-18 | 2 | -3/+3 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-15 | 2 | -2/+0 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-10 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-26 | 1 | -2/+2 |
| | |||||
* | Format vue files with prettier | Marcel van Remmerden | 2019-06-06 | 2 | -2/+2 |
| | | | | Add changelog file | ||||
* | Makes 'diff/content' partial use instance method | Mayra Cabrera | 2019-05-21 | 1 | -1/+1 |
| | | | | There's a method defined on viewer that does the conditional. | ||||
* | Replaces CSS with utility class59841-show-commits | Filipa Lacerda | 2019-04-12 | 1 | -1/+1 |
| | |||||
* | Fix old image diff swipe view | ftab | 2019-04-05 | 2 | -3/+3 |
| | |||||
* | Move swipe diff border to the right | ftab | 2019-04-04 | 1 | -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 class | Douwe Maan | 2019-03-26 | 2 | -3/+3 |
| | |||||
* | Add .code to all tables holding diffs | Douwe Maan | 2019-03-26 | 1 | -2/+2 |
| | | | | | We need this to be able to distinguish between Markdown tables and diff tables. | ||||
* | Correct file-header spacing on compare page | Sam Bigelow | 2019-02-06 | 2 | -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" text | Stan Hu | 2019-01-09 | 1 | -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 lfs | Francisco Javier López | 2018-12-27 | 1 | -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 header | Phil Hughes | 2018-11-27 | 2 | -4/+5 |
| | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54503 | ||||
* | Externalize strings from `/app/views/projects/diffs` | George Tsiolis | 2018-11-20 | 14 | -22/+20 |
| | |||||
* | Fix broken UI on commit discussions | Annabel Dunstone Gray | 2018-11-13 | 1 | -1/+1 |
| | |||||
* | Disable existing offenses for the CodeReuse cops | Yorick Peterse | 2018-09-11 | 1 | -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 violations | Robert Speicher | 2018-08-31 | 2 | -3/+0 |
| | |||||
* | Escaped html characters | Chantal Rollison | 2018-08-21 | 2 | -4/+4 |
| | |||||
* | Resolve ""Click to expand" link in collapsed diffs should be blue" | Annabel Gray | 2018-06-14 | 1 | -1/+1 |
| | |||||
* | Fix hide whitespace changes button | Clement Ho | 2018-05-24 | 1 | -1/+1 |
| | |||||
* | Rename btn-secondary to btn-default | Annabel Dunstone Gray | 2018-05-10 | 1 | -1/+1 |
| | |||||
* | Fix broken layout on compare branches page | Annabel Dunstone Gray | 2018-05-09 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-08 | 1 | -1/+1 |
|\ | |||||
| * | [Rails5] Use `safe_params` instead of `params` in `url_for` helpers | blackst0ne | 2018-04-28 | 1 | -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 modes | Clement Ho | 2018-04-24 | 1 | -5/+5 |
| | | |||||
* | | fix blobs edit spec | Clement Ho | 2018-04-23 | 1 | -1/+1 |
| | | |||||
* | | Fix diff stats sticky bar | Clement Ho | 2018-04-18 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into 'bootstrap4' | Clement Ho | 2018-04-18 | 1 | -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` helper | blackst0ne | 2018-04-08 | 1 | -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 Ho | 2018-04-13 | 1 | -1/+1 |
| | | |||||
* | | [skip ci] Replace hidden-xs | Clement Ho | 2018-04-09 | 2 | -4/+4 |
| | | |||||
* | | [skip ci] Replace hidden-sm | Clement Ho | 2018-04-09 | 2 | -2/+2 |
| | | |||||
* | | [skip ci] Rename .hide to .d-none | Clement Ho | 2018-04-09 | 1 | -5/+5 |
| | | |||||
* | | [skip ci] Replace .pull-right with .float-right | Clement Ho | 2018-04-09 | 2 | -2/+2 |
| | | |||||
* | | Rename .btn-default to .btn-secondary | Clement Ho | 2018-04-09 | 1 | -1/+1 |
|/ | |||||
* | Resolve "GitLab Community Edition 10.5.3 shows plural for 1 item" | Jan | 2018-03-19 | 1 | -2/+2 |
| | |||||
* | refactor code based on feedback | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | |||||
* | some initial refactoring | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | |||||
* | Merge branch '41491-fix-nil-blob-name-error' into 'master' | Annabel Dunstone Gray | 2018-01-10 | 2 | -2/+7 |
|\ | | | | | | | | | | | | | Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237 | ||||
| * | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-error | Eric Eastwood | 2018-01-09 | 2 | -2/+7 |
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491 | ||||
* | | Added LFS to merge request files tracked by LFSmerge-request-lfs-badge | Phil Hughes | 2018-01-10 | 1 | -0/+3 |
|/ | | | | Closes #41829 | ||||
* | Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsis | Phil Hughes | 2018-01-09 | 1 | -1/+1 |
| | | | | Closes #41561 |