Commit Graph

146 Commits

Author SHA1 Message Date
GitLab Bot 5b5ff31460 Add latest changes from gitlab-org/gitlab@master 2024-01-08 21:10:18 +00:00
GitLab Bot 1268cfeaf7 Add latest changes from gitlab-org/gitlab@master 2023-06-09 18:09:32 +00:00
GitLab Bot 404895390a Add latest changes from gitlab-org/gitlab@master 2023-05-31 21:09:09 +00:00
GitLab Bot f7b08f4264 Add latest changes from gitlab-org/gitlab@master 2023-03-22 12:11:32 +00:00
GitLab Bot 99f4b14cb0 Add latest changes from gitlab-org/gitlab@master 2023-02-17 15:09:22 +00:00
GitLab Bot 6f18a8d0b0 Add latest changes from gitlab-org/gitlab@master 2023-01-31 15:10:47 +00:00
GitLab Bot 18869e31e6 Add latest changes from gitlab-org/gitlab@master 2022-11-22 21:10:22 +00:00
GitLab Bot 0351d9ed83 Add latest changes from gitlab-org/gitlab@master 2022-10-25 18:10:57 +00:00
GitLab Bot 9b8aeacf0e Add latest changes from gitlab-org/gitlab@master 2022-04-11 15:09:47 +00:00
GitLab Bot 11d02c98dc Add latest changes from gitlab-org/gitlab@master 2022-03-21 03:08:23 +00:00
GitLab Bot 95b9a603c3 Add latest changes from gitlab-org/gitlab@master 2022-02-22 15:18:06 +00:00
GitLab Bot 3bdc719293 Add latest changes from gitlab-org/gitlab@master 2022-02-01 15:18:50 +00:00
GitLab Bot 60aef5496e Add latest changes from gitlab-org/gitlab@master 2021-11-12 18:12:20 +00:00
GitLab Bot 533f020a0b Add latest changes from gitlab-org/gitlab@master 2021-06-30 18:07:05 +00:00
GitLab Bot 41aebff8ec Add latest changes from gitlab-org/gitlab@master 2021-06-01 15:09:52 +00:00
GitLab Bot 5f5f492fe2 Add latest changes from gitlab-org/gitlab@master 2021-04-22 15:09:56 +00:00
GitLab Bot b81fd57f3d Add latest changes from gitlab-org/gitlab@master 2021-04-22 09:09:45 +00:00
GitLab Bot 98f1353fcd Add latest changes from gitlab-org/gitlab@master 2021-04-20 21:09:07 +00:00
GitLab Bot 8bcfcd53f3 Add latest changes from gitlab-org/gitlab@master 2021-04-20 15:09:24 +00:00
GitLab Bot 72179bac11 Add latest changes from gitlab-org/gitlab@master 2021-04-16 00:09:09 +00:00
GitLab Bot 74804f8c31 Add latest changes from gitlab-org/gitlab@master 2021-04-15 18:09:01 +00:00
GitLab Bot beab869416 Add latest changes from gitlab-org/gitlab@master 2021-04-12 21:11:12 +00:00
GitLab Bot dc7cd84a3e Add latest changes from gitlab-org/gitlab@master 2021-04-07 09:09:06 +00:00
GitLab Bot 5facc34f44 Add latest changes from gitlab-org/gitlab@master 2021-03-31 15:10:27 +00:00
GitLab Bot e8c01bc6a1 Add latest changes from gitlab-org/gitlab@master 2021-03-15 21:09:16 +00:00
GitLab Bot a0213db466 Add latest changes from gitlab-org/gitlab@master 2021-03-15 18:09:05 +00:00
GitLab Bot 6f2b1c32f3 Add latest changes from gitlab-org/gitlab@master 2021-03-09 15:08:59 +00:00
GitLab Bot 57f6fa3cd7 Add latest changes from gitlab-org/gitlab@master 2021-02-22 18:10:55 +00:00
GitLab Bot b6e10aaed7 Add latest changes from gitlab-org/gitlab@master 2021-02-10 09:09:38 +00:00
GitLab Bot f4726e9f50 Add latest changes from gitlab-org/gitlab@master 2021-02-04 21:09:06 +00:00
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18: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 f6e985dba4 Add latest changes from gitlab-org/gitlab@master 2020-01-08 06:08:13 +00:00
GitLab Bot bbe2430603 Add latest changes from gitlab-org/gitlab@master 2019-12-18 18:08:04 +00:00
GitLab Bot eca3cd3a9e Add latest changes from gitlab-org/gitlab@master 2019-11-15 18:06:24 +00:00
Yorick Peterse 6683298fe6 Merge branch 'security-commit-private-related-mr' into 'master'
Don't allow non-members to see private related MRs

Closes #2787

See merge request gitlab/gitlabhq!2866
2019-03-04 18:37:10 +00:00
Patrick Bajao 65723a2cb6 Modify MergeRequestsFinder to allow filtering by commit 2019-01-28 15:11:38 +08:00
Rémy Coutable 3a2abc1d50
Enable the Layout/ExtraSpacing cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
Filipa Lacerda 87444fb6ed
Adds pagination to pipelines table in merge request page 2018-10-31 17:10:36 +00:00
gfyoung 12ee2753c1 Enable even more frozen string in app/controllers
Enables frozen string for some vestigial files as
well as the following:

* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb

Partially addresses #47424.
2018-09-25 22:43:49 -07:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
George Andrinopoulos cab5039c91 Fix branch name in case of new merge request cherry pick 2018-08-19 23:28:54 +03:00
George Andrinopoulos 70830c2300 Add target branch to cherry pick confirmation message 2018-08-19 23:11:49 +03:00
Bob Van Landuyt f1d3ea63cf Show the status of a user in interactions
The status is shown for
- The author of a commit when viewing a commit
- Notes on a commit (regular/diff)
- The user that triggered a pipeline when viewing a pipeline
- The author of a merge request when viewing a merge request
- The author of notes on a merge request (regular/diff)
- The author of an issue when viewing an issue
- The author of notes on an issue
- The author of a snippet when viewing a snippet
- The author of notes on a snippet
- A user's profile page
- The list of members of a group/user
2018-07-30 15:01:26 +02:00
Zeger-Jan van de Weg dfdd881510
Workhorse to send raw diff and patch for commits
Prior to this change, this was done through unicorn. In theory this
could time out. Workhorse has been sending these raw patches and diffs
for a long time and is stable in doing so.

Added bonus is the fact that `Commit#to_patch` can be removed.

`Commit#to_diff` too, which closes
https://gitlab.com/gitlab-org/gitaly/issues/324

Closes https://gitlab.com/gitlab-org/gitaly/issues/1196
2018-05-16 11:52:43 +02:00
Lin Jen-Shin 28bae3b6bc Resolve "tree/master shows incorrect CI build status" 2018-04-11 13:54:55 +00:00
Hiroyuki Sato a7d26f00c3 Display related merge requests in commit detail page 2018-01-12 20:38:36 +00:00
Douwe Maan e4eba908cd Allow commenting on individual commits inside an MR 2017-12-07 09:01:19 -05:00
Zeger-Jan van de Weg f9565e3039
Batchload blobs for diff generation
After installing a new gem, batch-loader, a construct can be used to
queue data to be fetched in bulk. The gem was also introduced in both
gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs
are not merged yet.

For the generation of diffs, both the old blob and the new blob need to
be loaded. This for every file in the diff, too. Now we collect all
these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed,
which I expect to be valid, but this needs to be confirmed by a full CI
run.

Possibly closes:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37445
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37599
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
2017-11-21 13:53:26 +01:00
Brett Walker cbdf372eb8 implemented using an ivar, and added specs 2017-10-13 19:11:11 +02:00