340f15b402
Add latest changes from gitlab-org/gitlab@master
2020-06-30 15:08:48 +00:00
d081e00aa7
Add latest changes from gitlab-org/gitlab@master
2020-06-24 12:09:24 +00:00
94221585ca
Add latest changes from gitlab-org/gitlab@master
2020-06-23 00:08:58 +00:00
8eef083ccd
Add latest changes from gitlab-org/gitlab@master
2020-06-18 12:09:25 +00:00
4f584f7b63
Add latest changes from gitlab-org/gitlab@master
2020-06-10 21:09:29 +00:00
99c01aa686
Add latest changes from gitlab-org/gitlab@master
2020-06-08 18:08:27 +00:00
340fd2966e
Add latest changes from gitlab-org/gitlab@master
2020-06-04 00:08:17 +00:00
1f1e53f43f
Add latest changes from gitlab-org/gitlab@master
2020-05-28 15:08:02 +00:00
a83a97f604
Add latest changes from gitlab-org/gitlab@master
2020-05-28 12:08:10 +00:00
5c763ac4c6
Add latest changes from gitlab-org/gitlab@master
2020-05-27 06:08:13 +00:00
6ee98e1273
Add latest changes from gitlab-org/gitlab@master
2020-05-26 18:08:20 +00:00
674e7e2c3d
Add latest changes from gitlab-org/gitlab@master
2020-05-14 12:08:21 +00:00
1c4773ed84
Add latest changes from gitlab-org/gitlab@master
2020-05-14 06:08:18 +00:00
8ff63012e9
Add latest changes from gitlab-org/gitlab@master
2020-05-12 15:10:33 +00:00
0e1a6f6a2b
Add latest changes from gitlab-org/gitlab@master
2020-05-12 09:09:31 +00:00
6217d19741
Add latest changes from gitlab-org/gitlab@master
2020-05-11 15:09:37 +00:00
66108e3b34
Add latest changes from gitlab-org/gitlab@master
2020-05-08 21:09:47 +00:00
39fa1b5987
Add latest changes from gitlab-org/gitlab@master
2020-04-27 09:09:51 +00:00
fdd0b0fd45
Add latest changes from gitlab-org/gitlab@master
2020-04-23 18:09:46 +00:00
e33f87ac0f
Add latest changes from gitlab-org/gitlab@master
2020-04-21 15:21:10 +00:00
09093c1278
Add latest changes from gitlab-org/gitlab@master
2020-04-15 18:09:36 +00:00
209bd8cf1f
Add latest changes from gitlab-org/gitlab@master
2020-04-09 15:09:29 +00:00
ba174c982f
Add latest changes from gitlab-org/gitlab@master
2020-04-06 12:10:44 +00:00
95ad46159e
Add latest changes from gitlab-org/gitlab@master
2020-03-30 21:08:01 +00:00
101c30f4df
Add latest changes from gitlab-org/gitlab@master
2020-03-26 00:07:58 +00:00
729e3765d5
Add latest changes from gitlab-org/gitlab@master
2020-03-24 12:09:42 +00:00
074d013e1e
Add latest changes from gitlab-org/gitlab@master
2020-03-23 15:09:36 +00:00
2c156e3c7b
Add latest changes from gitlab-org/gitlab@master
2020-03-17 18:09:44 +00:00
3cd08f4bf9
Add latest changes from gitlab-org/gitlab@master
2020-03-13 00:09:34 +00:00
5781a49660
Add latest changes from gitlab-org/gitlab@master
2020-03-12 00:09:34 +00:00
f4186a753b
Add latest changes from gitlab-org/gitlab@master
2020-03-09 09:07:45 +00:00
df2eda3f14
Add latest changes from gitlab-org/gitlab@master
2020-02-20 18:08:51 +00:00
33795139ea
Add latest changes from gitlab-org/gitlab@master
2020-02-19 18:09:10 +00:00
0637ba1e6e
Add latest changes from gitlab-org/gitlab@master
2020-02-18 12:09:15 +00:00
10213bf3b2
Add latest changes from gitlab-org/gitlab@master
2020-02-14 06:09:03 +00:00
e144369009
Add latest changes from gitlab-org/gitlab@master
2020-02-14 00:09:07 +00:00
1308dc5eb4
Add latest changes from gitlab-org/gitlab@master
2020-02-13 12:08:49 +00:00
11e5d1b9ca
Add latest changes from gitlab-org/gitlab@master
2020-02-10 15:08:54 +00:00
6b9d3a4e83
Add latest changes from gitlab-org/gitlab@master
2020-01-29 18:08:47 +00:00
23288f62da
Add latest changes from gitlab-org/gitlab@master
2020-01-29 15:08:59 +00:00
7cc6872401
Add latest changes from gitlab-org/gitlab@master
2020-01-29 12:09:08 +00:00
3f9e1b2611
Add latest changes from gitlab-org/gitlab@master
2020-01-23 15:08:46 +00:00
b6ec12ceca
Add latest changes from gitlab-org/gitlab@master
2020-01-22 21:08:48 +00:00
c859c3bfd2
Add latest changes from gitlab-org/gitlab@master
2020-01-21 15:08:26 +00:00
727b1a890c
Add latest changes from gitlab-org/gitlab@master
2020-01-16 21:08:24 +00:00
08ed6a867b
Add latest changes from gitlab-org/gitlab@master
2020-01-16 03:08:47 +00:00
85e494935a
Add latest changes from gitlab-org/gitlab@master
2020-01-14 15:07:55 +00:00
f32a580aa1
Add latest changes from gitlab-org/gitlab@master
2020-01-13 18:08:05 +00:00
c0d8f9f3f9
Add latest changes from gitlab-org/gitlab@master
2020-01-03 09:07:33 +00:00
bbe2430603
Add latest changes from gitlab-org/gitlab@master
2019-12-18 18:08:04 +00:00
d10a462fed
Add latest changes from gitlab-org/gitlab@master
2019-12-16 12:07:43 +00:00
8cc5f27909
Add latest changes from gitlab-org/gitlab@master
2019-12-13 12:07:41 +00:00
6b8040dc25
Add latest changes from gitlab-org/gitlab@master
2019-12-11 09:08:12 +00:00
27d91a6299
Add latest changes from gitlab-org/gitlab@master
2019-12-10 15:07:52 +00:00
2349eabc1a
Add latest changes from gitlab-org/gitlab@master
2019-12-06 00:07:48 +00:00
8d3aee3636
Add latest changes from gitlab-org/gitlab@master
2019-12-04 15:11:23 +00:00
8644755363
Add latest changes from gitlab-org/gitlab@master
2019-12-01 06:06:11 +00:00
7ddd584699
Add latest changes from gitlab-org/gitlab@master
2019-11-30 00:06:03 +00:00
eac0da9a47
Add latest changes from gitlab-org/gitlab@master
2019-11-29 15:06:43 +00:00
7cdd70dcec
Add latest changes from gitlab-org/gitlab@master
2019-11-28 15:06:57 +00:00
3269a20692
Add latest changes from gitlab-org/gitlab@master
2019-11-27 12:06:30 +00:00
68d3f33d51
Add latest changes from gitlab-org/gitlab@master
2019-11-26 15:06:50 +00:00
69a23cbee1
Add latest changes from gitlab-org/gitlab@master
2019-11-22 21:06:19 +00:00
4db9eeb44a
Add latest changes from gitlab-org/gitlab@master
2019-11-22 12:06:25 +00:00
a68e9d3318
Add latest changes from gitlab-org/gitlab@master
2019-11-20 12:06:01 +00:00
b570d73ecd
Add latest changes from gitlab-org/gitlab@master
2019-11-19 12:06:00 +00:00
34b3567c97
Add latest changes from gitlab-org/gitlab@master
2019-11-19 09:06:16 +00:00
6e81d7f628
Add latest changes from gitlab-org/gitlab@master
2019-11-15 15:06:12 +00:00
d8c06be498
Add latest changes from gitlab-org/gitlab@master
2019-11-14 12:06:30 +00:00
3318518149
Add latest changes from gitlab-org/gitlab@master
2019-11-13 15:07:29 +00:00
69944ffb68
Add latest changes from gitlab-org/gitlab@master
2019-11-12 15:06:26 +00:00
ee6b185429
Add latest changes from gitlab-org/gitlab@master
2019-11-07 00:06:18 +00:00
82cef8dd1f
Add latest changes from gitlab-org/gitlab@master
2019-11-05 21:07:46 +00:00
ad8eea3834
Merge dev.gitlab.org@master into GitLab.com@master
2019-10-30 15:22:45 +01:00
d64e3a8b28
Add latest changes from gitlab-org/gitlab@master
2019-10-29 12:06:40 +00:00
20cb4f7ab5
Only assign merge params when allowed
...
When a user updates a merge request coming from a fork, they should
not be able to set `force_remove_source_branch` if they cannot push
code to the source project.
Otherwise developers of the target project could remove the source
branch of the source project by setting this flag through the API.
2019-10-24 12:19:56 +02:00
b1bcdba89b
Add latest changes from gitlab-org/gitlab@master
2019-10-22 12:06:20 +00:00
8dfb94309c
Add latest changes from gitlab-org/gitlab@master
2019-10-22 00:06:05 +00:00
ad1e4b8fb8
Add latest changes from gitlab-org/gitlab@master
2019-10-21 15:05:58 +00:00
25989ab7ef
Add latest changes from gitlab-org/gitlab@master
2019-10-18 11:11:44 +00:00
308146dc39
Add latest changes from gitlab-org/gitlab@master
2019-10-10 00:06:44 +00:00
ab2382923e
Add latest changes from gitlab-org/gitlab@master
2019-10-07 09:05:55 +00:00
80f61b4035
Add latest changes from gitlab-org/gitlab@master
2019-09-18 14:02:45 +00:00
84727c8209
Add latest changes from gitlab-org/gitlab@master
2019-09-16 15:06:26 +00:00
b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
0a5bce6e4f
Backport changes for 16252 in EE add current_user to report comparison services
2019-09-11 15:33:50 +00:00
f2754e416e
Use delete_all for deleting events
...
Because we don't have any destroy callbacks (or other logic
triggered on event destroy), there is no reason for deleting events
inefficiently one by one, instead we can use :delete_all.
2019-09-07 06:43:17 +02:00
46f6a4e077
Extend License Compliance entity for Pipelines and MR view
2019-09-05 17:03:40 +00:00
0e40b41e22
Add structure to support EE feature of COAR
...
These are the structural changes for supporting the EE feature of moving
"code_owner_approval_required" state from existing on a project to being
on the protected branches individually, allowing for CODEOWNER
validation on push events.
2019-09-05 13:01:36 +00:00
8c21610c79
Add pipeline.type key to PipelineEntity
...
This commit adds pipeline.type key to PipelineEntity.
This key will be used in MR widget in the next iteration.
2019-09-03 13:30:53 +07:00
d31b733fee
Only read rebase status from the model
...
Prior to 12.1, rebase status was looked up directly from Gitaly. In
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14417 , a DB
column was added to track the status instead. However, we couldn't stop
looking at the gitaly status immediately, since some rebases may been
running across the upgrade.
Now that we're in 12.3, it is safe to remove the direct-to-gitaly
lookup. This also happens to fix a 500 error that is seen when viewing
an MR for a fork where the source project has been removed.
We still look at the Gitaly status in the service, just in case Gitaly
and Sidekiq get out of sync - I assume this is possible, and it's a
relatively cheap check.
Since we atomically check and set `merge_requests.rebase_jid`, we
should never enqueue two `RebaseWorker` jobs in parallel.
2019-08-15 18:54:08 +00:00
b99011af62
Split MR widget into cached and non-cached serializers
...
Splits auto-refreshing of MR widget into 2 requests:
- the one which uses etag-caching and invalidates the fields on change
- the one without caching
The idea is to gradually move all the fields to etag-cached endpoint
2019-08-09 21:01:55 +00:00
01950c3944
CE port for bulk updating group labels
...
- Original EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14827
2019-08-08 06:25:20 +00:00
f4cd926cf3
Add exclusive lease to mergeability check process
...
Concurrent calls to UserMergeToRef RPC updating a single ref
can lead to an opaque fail that is being rescued at Gitaly.
So this commit adds an exclusive lease to the mergeability
check process with the key as the current MR ID.
2019-07-31 19:58:43 -03:00
988dc80585
Further remove code branches by database type
...
We dropped MySQL support and a lot of mysql specific code has been
removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29608 .
This comes in from the other direction and removes any `if postgresql?`
branches.
2019-07-29 12:47:06 +02:00
dbb71847bc
Merge branch 'dz-remove-old-ignore-column' into 'master'
...
Remove old ignore_column in AR models
See merge request gitlab-org/gitlab-ce!30725
2019-07-16 21:13:18 +00:00
ec51240685
Add commit_id to AttributeCleaner::ALLOWED_REFERENCES
2019-07-15 10:30:39 +01:00
3d171dc271
Remove old ignore_column in AR models
...
Next models are affected:
* Project
* Namespace
* Issue
* Merge request
* CI Trigger
* CI Pipeline schedule
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-07-15 09:38:57 +03:00
19dcb081d3
Always return MR diff_refs if importing
...
This change fixes a bug that prevents projects being
imported when there are diff notes present in merge requests.
Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/63955
2019-07-11 16:09:51 +01:00
f8d6f7322e
Fix race condition on merge train ref generation
...
Today, Pipelines for merge train run on `refs/merge`,
however, this causes a race condition that it can be
overwritten by CheckMergeabilityService.
This patch fixes the problem by generating `refs/train`
for those pipelines.
2019-07-08 14:36:32 +07:00
GitLab Bot
Yorick Peterse
Bob Van Landuyt
Can Eldem
Jan Provaznik
Kerri Miller
Shinya Maeda
Nick Thomas
Igor
Eugenia Grieff
Oswaldo Ferreira
Andreas Brandl
Robert Speicher
George Koltsov
Dmitriy Zaporozhets