root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
115,420 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

101 Commits

Author SHA1 Message Date
GitLab Bot c6012868fb Add latest changes from gitlab-org/gitlab@master 2024-11-25 09:23:59 +00:00
GitLab Bot 66b78786e8 Add latest changes from gitlab-org/gitlab@master 2024-06-07 09:23:25 +00:00
GitLab Bot 4cb3bd9c1a Add latest changes from gitlab-org/gitlab@master 2024-06-05 00:13:54 +00:00
GitLab Bot 742ae51908 Add latest changes from gitlab-org/gitlab@master 2024-02-02 21:09:48 +00:00
GitLab Bot 447c1bba67 Add latest changes from gitlab-org/gitlab@master 2023-07-12 09:09:19 +00:00
GitLab Bot e6fed37d94 Add latest changes from gitlab-org/gitlab@master 2023-05-15 12:07:19 +00:00
GitLab Bot 78782cd1eb Add latest changes from gitlab-org/gitlab@master 2023-04-06 15:08:20 +00:00
GitLab Bot e77cb2465f Add latest changes from gitlab-org/gitlab@master 2023-03-27 15:08:31 +00:00
GitLab Bot f01d3c8c09 Add latest changes from gitlab-org/gitlab@master 2023-03-16 12:10:54 +00:00
GitLab Bot 5b98c2c506 Add latest changes from gitlab-org/gitlab@master 2022-12-09 12:08:19 +00:00
GitLab Bot 70eb0cf751 Add latest changes from gitlab-org/gitlab@master 2022-08-10 12:12:15 +00:00
GitLab Bot 77839aae00 Add latest changes from gitlab-org/gitlab@master 2022-04-21 12:10:16 +00:00
GitLab Bot 9769ccf613 Add latest changes from gitlab-org/gitlab@master 2022-04-14 12:09:31 +00:00
GitLab Bot 9b8aeacf0e Add latest changes from gitlab-org/gitlab@master 2022-04-11 15:09:47 +00:00
GitLab Bot 85ea3dd4f4 Add latest changes from gitlab-org/gitlab@master 2022-03-31 15:08:32 +00:00
GitLab Bot 1785d4e4aa Add latest changes from gitlab-org/gitlab@master 2021-04-29 21:10:03 +00:00
GitLab Bot 98f1353fcd Add latest changes from gitlab-org/gitlab@master 2021-04-20 21:09:07 +00:00
GitLab Bot 6d18e2830d Add latest changes from gitlab-org/gitlab@master 2021-04-05 18:09:15 +00:00
GitLab Bot 1fdc1d34e8 Add latest changes from gitlab-org/gitlab@master 2021-02-19 12:11:06 +00:00
GitLab Bot b6e10aaed7 Add latest changes from gitlab-org/gitlab@master 2021-02-10 09:09:38 +00:00
GitLab Bot 6b5e293c6d Add latest changes from gitlab-org/gitlab@master 2020-10-20 15:08:57 +00:00
GitLab Bot 79c7e23671 Add latest changes from gitlab-org/gitlab@master 2020-10-14 03:08:32 +00:00
GitLab Bot 999f47e9e6 Add latest changes from gitlab-org/gitlab@master 2020-08-12 12:10:25 +00:00
GitLab Bot 840d5ecdbb Add latest changes from gitlab-org/gitlab@master 2020-07-02 15:09:08 +00:00
GitLab Bot 69849c280c Add latest changes from gitlab-org/gitlab@master 2019-10-10 12:06:19 +00:00
Sam Bigelow 5218da5759
Correct file-header spacing on compare page 
Use special classes when is_compare, similar to is_commit. Default
expectation is diff is being viewed in MR
 2019-02-06 17:04:19 +01:00
Phil Hughes 79ce045dc4
Fixed UI bugs with sticky diff header 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54503
 2018-11-27 10:14:58 +00:00
George Tsiolis 58b3b7732b Externalize strings from `/app/views/projects/diffs` 2018-11-20 12:38:52 +02:00
Clement Ho c6d1ce20fd Fix hide whitespace changes button 2018-05-24 17:42:31 -05:00
Annabel Dunstone Gray bed783ac15
Rename btn-secondary to btn-default 2018-05-10 12:22:56 -07:00
Annabel Dunstone Gray dc40e2a919
Fix broken layout on compare branches page 2018-05-09 10:24:59 -07:00
Clement Ho 5955caed32 Merge branch 'master' into bootstrap4 2018-05-08 10:49:30 -05:00
blackst0ne 350e26b8a6 [Rails5] Use `safe_params` instead of `params` in `url_for` helpers 
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
 2018-04-28 21:35:16 +11:00
Clement Ho 2cd9542e3c Fix diff stats sticky bar 2018-04-18 14:18:16 -05:00
Clement Ho 9bcf8f43c6 [skip ci] Replace hidden-xs 2018-04-09 16:50:40 -05:00
Clement Ho 35991d1662 [skip ci] Replace hidden-sm 2018-04-09 16:36:25 -05:00
Clement Ho 917b7e0dd9 Rename .btn-default to .btn-secondary 2018-04-09 11:49:18 -05:00
Phil Hughes 151ecac770
Fixed changed files dropdown not being shown 
Closes #36479
 2017-08-15 17:26:33 +01:00
Phil Hughes c76091804f
Fix the sticky changes bar on commits page 2017-08-09 16:40:27 +01:00
Phil Hughes 81fd197c64
Fixed merge request changes sticky container not spreading full width 2017-08-08 17:12:11 +01:00
Phil Hughes 655510ec9a
fixed haml lint 2017-08-03 17:03:49 +01:00
Douwe Maan 70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00
Douwe Maan aed0387f97 Consistent diff and blob size limit names 2017-05-29 17:02:02 -05:00
Douwe Maan 7e09a9b7dc Clean up diff rendering 2017-05-23 15:37:05 -05:00
Douwe Maan 0d1ec11e89 Use Blob methods instead of BlobHelper helpers 2017-04-27 12:23:26 -05:00
Douwe Maan 27f2ca9418 Add 'View on [env]' link to blobs and individual files in diffs 2017-02-06 16:12:23 -06:00
Felipe Artur ca0cf5a3cd Show 'too many changes' message for merge request 2017-01-12 13:41:29 -02:00
Yar 8782bb96cc Unify anchor link format for MR diff files !7298 
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
 2016-11-15 20:51:21 +03:00
Paco Guzman ca3c0c6cd9 MergeRequest new form load diff asynchronously 2016-10-06 11:19:14 +02:00
Mike Greiling 76ae5af8ce ensure the 'fixed layout' preference is honored whenever possible 
see #22343 for issue description
 2016-09-20 00:51:00 -05:00