1eec6b22b2
Add latest changes from gitlab-org/gitlab@master
2021-02-16 18:09:24 +00:00
b6e10aaed7
Add latest changes from gitlab-org/gitlab@master
2021-02-10 09:09:38 +00:00
64f7eb2b37
Add latest changes from gitlab-org/gitlab@master
2021-02-05 12:09:31 +00:00
7c221ba5ce
Add latest changes from gitlab-org/gitlab@master
2021-02-04 18:09:22 +00:00
1743439667
Add latest changes from gitlab-org/gitlab@master
2021-02-03 18:09:25 +00:00
bdf5d637da
Add latest changes from gitlab-org/gitlab@master
2021-02-02 12:10:15 +00:00
c6c346e8c7
Add latest changes from gitlab-org/gitlab@master
2021-01-28 21:09:04 +00:00
874d5e8019
Add latest changes from gitlab-org/gitlab@master
2021-01-27 18:09:08 +00:00
ea037b9157
Add latest changes from gitlab-org/gitlab@master
2021-01-21 09:08:52 +00:00
39c1496527
Add latest changes from gitlab-org/gitlab@master
2021-01-13 12:10:27 +00:00
a0cbad8bf4
Add latest changes from gitlab-org/gitlab@master
2021-01-08 21:10:30 +00:00
797182cd82
Add latest changes from gitlab-org/gitlab@master
2021-01-05 12:10:36 +00:00
cb3b8bd589
Add latest changes from gitlab-org/gitlab@master
2020-12-21 15:10:05 +00:00
eb8836dea4
Add latest changes from gitlab-org/gitlab@master
2020-12-21 12:10:22 +00:00
f3b791d5d5
Add latest changes from gitlab-org/gitlab@master
2020-12-17 18:10:14 +00:00
6364c14cc1
Add latest changes from gitlab-org/gitlab@master
2020-12-16 15:10:18 +00:00
e91cb68359
Add latest changes from gitlab-org/gitlab@master
2020-12-09 15:10:12 +00:00
4f0f7d5809
Add latest changes from gitlab-org/gitlab@master
2020-12-08 15:09:45 +00:00
1502c20d04
Add latest changes from gitlab-org/gitlab@master
2020-12-03 00:09:53 +00:00
259aa13174
Add latest changes from gitlab-org/gitlab@master
2020-12-01 00:09:28 +00:00
84e3154595
Add latest changes from gitlab-org/gitlab@master
2020-11-23 18:09:14 +00:00
4a31b87868
Add latest changes from gitlab-org/gitlab@master
2020-11-12 12:09:39 +00:00
9517d0eb2c
Add latest changes from gitlab-org/gitlab@master
2020-11-11 12:09:06 +00:00
5427433c6d
Add latest changes from gitlab-org/gitlab@master
2020-11-11 00:08:58 +00:00
b45d30ab76
Add latest changes from gitlab-org/gitlab@master
2020-11-07 00:08:58 +00:00
f3db01da50
Add latest changes from gitlab-org/gitlab@master
2020-11-06 18:09:07 +00:00
c93374099a
Add latest changes from gitlab-org/gitlab@master
2020-11-06 00:09:14 +00:00
98d7cc758f
Add latest changes from gitlab-org/gitlab@master
2020-10-30 18:08:56 +00:00
99551d4458
Add latest changes from gitlab-org/gitlab@master
2020-10-20 06:09:03 +00:00
fd11748fe8
Add latest changes from gitlab-org/gitlab@master
2020-10-16 21:09:08 +00:00
3775eba7c1
Add latest changes from gitlab-org/gitlab@master
2020-10-16 12:09:33 +00:00
ed7568cc80
Add latest changes from gitlab-org/gitlab@master
2020-10-16 09:09:06 +00:00
c311ce331f
Add latest changes from gitlab-org/gitlab@master
2020-10-16 03:08:29 +00:00
0b4bb101ea
Add latest changes from gitlab-org/gitlab@master
2020-10-01 18:10:20 +00:00
a27b8a5c10
Add latest changes from gitlab-org/gitlab@master
2020-10-01 12:10:14 +00:00
15229b03e0
Add latest changes from gitlab-org/gitlab@master
2020-09-30 21:10:09 +00:00
dd240e5cc4
Add latest changes from gitlab-org/gitlab@master
2020-09-30 15:09:46 +00:00
a071c2888d
Add latest changes from gitlab-org/gitlab@master
2020-09-23 12:09:58 +00:00
26879909dd
Add latest changes from gitlab-org/gitlab@master
2020-09-22 12:09:39 +00:00
1086ac5177
Add latest changes from gitlab-org/gitlab@master
2020-09-22 09:09:43 +00:00
88bff01768
Add latest changes from gitlab-org/gitlab@master
2020-09-21 18:09:58 +00:00
b85aae44f9
Add latest changes from gitlab-org/gitlab@master
2020-09-21 15:09:44 +00:00
7985071975
Add latest changes from gitlab-org/gitlab@master
2020-09-21 12:09:34 +00:00
dc86d5615e
Add latest changes from gitlab-org/gitlab@master
2020-09-18 12:09:50 +00:00
0115b63f64
Add latest changes from gitlab-org/gitlab@master
2020-09-18 06:09:31 +00:00
6de7d2c195
Add latest changes from gitlab-org/gitlab@master
2020-09-16 15:09:32 +00:00
9689350c65
Add latest changes from gitlab-org/gitlab@master
2020-09-14 21:09:27 +00:00
3d6d338697
Add latest changes from gitlab-org/gitlab@master
2020-09-11 15:08:30 +00:00
766b24b86b
Add latest changes from gitlab-org/gitlab@master
2020-09-10 12:08:54 +00:00
a69bb17d1e
Add latest changes from gitlab-org/gitlab@master
2020-09-08 06:08:57 +00:00
a865379008
Add latest changes from gitlab-org/gitlab@master
2020-09-07 12:08:27 +00:00
592223823c
Add latest changes from gitlab-org/gitlab@master
2020-09-03 18:08:29 +00:00
a1aeaba23e
Add latest changes from gitlab-org/gitlab@master
2020-09-03 09:08:20 +00:00
4b9ace6c1f
Add latest changes from gitlab-org/gitlab@master
2020-09-02 09:10:23 +00:00
304e230182
Add latest changes from gitlab-org/gitlab@master
2020-09-01 18:10:48 +00:00
0a6b019047
Add latest changes from gitlab-org/gitlab@master
2020-09-01 06:10:44 +00:00
184906087f
Add latest changes from gitlab-org/gitlab@master
2020-08-31 00:10:37 +00:00
67370c8b72
Add latest changes from gitlab-org/gitlab@master
2020-08-25 12:04:30 +00:00
9e68395a98
Add latest changes from gitlab-org/gitlab@master
2020-08-21 12:10:22 +00:00
3c63ea4631
Add latest changes from gitlab-org/gitlab@master
2020-08-21 06:10:27 +00:00
c787c1559e
Add latest changes from gitlab-org/gitlab@master
2020-08-13 18:10:36 +00:00
25bfb256b3
Add latest changes from gitlab-org/gitlab@master
2020-08-05 12:09:45 +00:00
2ecc6e22e3
Add latest changes from gitlab-org/gitlab@master
2020-08-04 18:09:49 +00:00
36b0a5b875
Add latest changes from gitlab-org/gitlab@master
2020-07-21 18:09:45 +00:00
95f5aad5aa
Add latest changes from gitlab-org/gitlab@master
2020-07-18 03:09:24 +00:00
651917dbac
Add latest changes from gitlab-org/gitlab@master
2020-07-15 21:09:26 +00:00
da1962d9ac
Add latest changes from gitlab-org/gitlab@master
2020-07-15 18:09:09 +00:00
49089d4fb1
Add latest changes from gitlab-org/gitlab@master
2020-07-14 12:09:14 +00:00
ff1701e51d
Add latest changes from gitlab-org/gitlab@master
2020-07-10 06:09:23 +00:00
83fc2f3dc8
Add latest changes from gitlab-org/gitlab@master
2020-07-08 21:09:09 +00:00
e5d314d432
Add latest changes from gitlab-org/gitlab@master
2020-07-03 15:09:13 +00:00
fe25c98fa8
Add latest changes from gitlab-org/gitlab@master
2020-07-01 21:08:51 +00:00
79040c6178
Add latest changes from gitlab-org/gitlab@master
2020-06-30 18:09:13 +00:00
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
381468d0cc
Allow asynchronous rebase operations to be monitored
...
This MR introduces tracking of the `rebase_jid` for merge requests. As
with `merge_ongoing?`, `rebase_in_progress?` will now return true if a
rebase is proceeding in sidekiq.
After one release, we should remove the Gitaly-based lookup of rebases.
It is much better to track this kind of thing via the database.
2019-07-04 08:50:55 +01:00
a0194172e0
Update TODO: allow_collaboration column renaming
2019-07-03 17:29:18 +08:00
e236fbdb25
Use actual_head_pipeline to enforce presence
2019-06-25 14:07:34 +01:00
a26916d18c
Require pipeline if "Pipeline must succeed" is set
...
When a user sets only_allow_merge_if_pipeline_succeeds, also named
as "Pipeline must succeed" project setting, we require the pipeline
to be present.
This solves race condition issues especially with external CI
providers when a build is triggered externally but no pipelines are
created in GitLab yet.
Document that a head pipeline is expected when using "Pipeline
must succeed" setting. Also explain limitations with the use of
only/except where there may not be any jobs created and the merge
request will not be allowed to be merged.
2019-06-25 10:12:02 +01:00
74a3e6b712
Avoid touching the MR status if MR is not opened
2019-06-21 11:30:09 -03:00
3af348b6cf
Automatically update MR merge-ref along merge status
...
This couples the code that transitions the `MergeRequest#merge_status`
and refs/merge-requests/:iid/merge ref update.
In general, instead of directly telling `MergeToRefService` to update
the merge ref, we should rely on `MergeabilityCheckService` to keep
both the merge status and merge ref synced. Now, if the merge_status is
`can_be_merged` it means the merge-ref is also updated to the latest.
We've also updated the logic to be more systematic and less user-based.
2019-06-20 11:48:30 -03:00
7639b5801c
Raise an error if creating the MergeRequestDiff fails
2019-06-13 16:30:29 +01:00
00a273d3a9
Revert "Automatically update MR merge-ref along merge status"
2019-06-11 13:08:25 -03:00
2a01b33e6a
Create BaseService for Auto Merge architecture
...
It abstracts some codes for common methods in AutoMerge::*Services.
2019-06-06 10:36:02 +07:00
96ff9c6bd8
Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'
...
Automatically update MR merge-ref along merge status
Closes #58495
See merge request gitlab-org/gitlab-ce!28513
2019-06-03 16:29:41 +00:00
6cb750a2bb
Merge dev.gitlab.org master into GitLab.com master
2019-06-03 14:56:33 +02:00
5dc6c8f2d0
Merge branch 'security-60039' into 'master'
...
Disallow invalid MR branch name
See merge request gitlab/gitlabhq!3052
2019-06-03 12:34:04 +00:00
d4b4693663
Abstract auto merge processes
...
We have one auto merge strategy today - Merge When Pipeline
Succeeds.
In order to add more strategies for Merge Train feature,
we abstract the architecture to be more extensible.
Removed arguments
Fix spec
2019-06-03 13:15:29 +07:00
4246a62118
Add payload to the service response
...
This introduces payload to the ServiceResponse with
the merge ref HEAD commit data
2019-05-31 19:16:01 -03:00
96db70a444
Simplify merge_ref_head methods
2019-05-31 19:16:01 -03:00
b965009ddd
Automatically update MR merge-ref along merge status
...
This couples the code that transitions the `MergeRequest#merge_status`
and refs/merge-requests/:iid/merge ref update.
In general, instead of directly telling `MergeToRefService` to update
the merge ref, we should rely on `MergeabilityCheckService` to keep
both the merge status and merge ref synced. Now, if the merge_status is
`can_be_merged` it means the merge-ref is also updated to the latest.
We've also updated the logic to be more systematic and less user-based.
2019-05-31 19:16:01 -03:00
37a335e60e
Fix remaining failures in shoulda-matcher
...
Starting with Rails 5, belongs_to now adds a presence validation to the
association, and so as of shoulda-matchers 4.0.0 the belong_to matcher
follows suit and tests that this validation is there by setting the
association to nil and asserting that there are validation errors. This
exposed an error with the `validate_branches` method: we need to check
the source and target project exist.
2019-05-21 23:19:07 -07:00
d4d2cf7327
Fix merge request pipeline exist method
...
Refactor
2019-05-06 13:20:47 +07:00
d8bddb1662
Validate MR branch names
...
Prevents refspec as branch name, which would bypass branch protection
when used in conjunction with rebase.
HEAD seems to be a special case with lots of occurrence,
so it is considered valid for now.
Another special case is `refs/head/*`, which can be imported.
2019-05-03 03:02:58 +08:00
daa8f784d0
Fix environment automatic on_stop trigger
...
Due to the nature of pipelines for merge requests, deployments.ref can
be a merge request ref instead of a branch name.
We support the environment auto-stop hook for this case
2019-04-30 21:15:39 +07:00
624a1cdab4
Upgrade Rails to 5.1.6.1
...
Model.new.attributes now also returns encrypted attributes.
2019-04-23 08:31:23 +08:00
0cfa25ff21
Backport changes from EE
...
This backports the changes from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10452
2019-04-16 13:06:52 +02:00
ca884980ee
[CE] Support multiple assignees for merge requests
...
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
2019-04-08 18:40:00 -03:00
0e5dbaf87f
Do not show system notes on commits in the MR page
2019-04-02 22:59:43 +08:00
351b39f172
Backport splitting approval changes from CE
...
Author and committers approvals are split in EE
This commit provides backports for those changes
This reverts commit 886f00bcba
2019-04-02 11:01:07 +00:00
f87b7fe3b3
Merge branch 'issue_51789_part_1' into 'master'
...
Migrate issuable states to integer patch 1 of 2
Closes #51789
See merge request gitlab-org/gitlab-ce!25107
2019-04-02 08:39:53 +00:00
d8258470b5
Merge branch 'check-mergeability-in-merge-to-ref-service' into 'master'
...
Check mergeability in merge to ref service
See merge request gitlab-org/gitlab-ce!26757
2019-04-01 16:17:10 +00:00
45293f66fa
Fix MergeRequest#has_commits? nil comparison
2019-04-01 15:13:22 +00:00
a7d4824ded
Check mergeability in merge to ref service
...
and add spec
Add changelog
ok
ok
2019-04-01 14:02:57 +07:00
0d26c48332
Merge branch 'persist-fulll-ref-path-for-mr-pipelines' into 'master'
...
Use merge request HEAD ref for detached merge request pipelines
Closes #58454
See merge request gitlab-org/gitlab-ce!25504
2019-03-29 10:46:02 +00:00
bf639fd504
Create detached merge request pipelines
...
By using `refs/merge-requests/:iid/head`
ok
ok
Improve naming nicely
Add nice tests
add nice tests
fix some more
revert
2019-03-29 13:58:45 +07:00
013f7cd24c
Inherit from ApplicationRecord instead of ActiveRecord::Base
2019-03-28 16:18:23 +00:00
16a3fea399
Merge master
2019-03-27 15:19:12 -03:00
03e0604d5d
Prepare suggestion implementation for multi-line
...
Adds the groundwork needed in order to persist multi-line suggestions,
while providing the parsing strategy which will be reused for the
**Preview** as well.
2019-03-27 12:26:53 -03:00
929ee4d18d
Add multiple assignees migration and table population
...
This will be further required for supporting multi-assignees MRs
2019-03-25 19:50:40 -03:00
7e6b57499f
Update merge request widget pipeline block
...
This commit updates the pipeline block that appears on the merge request
page to include information that will be exposed by the API as part of
the post-merge pipeline feature.
2019-03-21 15:31:09 +00:00
b913169d88
Make all_pipelines method compatible with pipelines for merge requests
...
Make it sane
Include merge ref head
Fix union
Improve a bit
Add spec
remove
add spec
Add changelog
fix coding offence
Apply suggestion to spec/models/merge_request_spec.rb
ok
ok
Fix
Fix spec
Fix spec
fix
Simplify the things
Memoize
OK
a
2019-03-13 19:26:38 +07:00
de784ac105
Filter merge requests by target branch
2019-03-09 12:22:58 +00:00
062efe4f7a
Significantly reduce N+1 queries in /api/v4/todos endpoint
...
By preloading associations and batching issuable metadata lookups,
we can significantly cut the number of SQL queries needed to load
the Todos API endpoint.
On GitLab.com, my own tests showed my user's SQL queries went
from 365 to under 60 SQL queries.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40378
2019-03-06 07:03:46 -08:00
83cb748256
Merge branch 'merge-dev-to-master' into 'master'
...
Merge dev.gitlab.org master into GitLab.com master
Closes #2794 , #2814 , #2806 , #2805 , #2798 , #2795 , #2788 , and #2787
See merge request gitlab-org/gitlab-ce!25746
2019-03-05 10:28:59 +00:00
2b0a0f9b03
Merge branch 'master' into expose-additional-merge-request-pipeline-variables
...
Conflicts:
doc/ci/variables/README.md
spec/models/ci/pipeline_spec.rb
2019-03-04 21:07:36 +00:00
025015048f
Merge branch 'security-2773-milestones-fix' into 'master'
...
[master] Check issue milestone availability
See merge request gitlab/gitlabhq!2788
2019-03-04 18:37:15 +00:00
ebf16ada85
Arbitrary file read via MergeRequestDiff
2019-03-04 18:36:34 +00:00
1ad699677f
Support merge to ref for merge-commit and squash
...
Adds the ground work for writing into
the merge ref refs/merge-requests/:iid/merge the
merge result between source and target branches of
a MR, without further side-effects such as
mailing, MR updates and target branch changes.
2019-02-25 10:40:58 -03:00
648b87315d
Merge branch 'master' into issue_51789_part_1
2019-02-19 11:35:29 -03:00
8f209ed5ea
Merge branch 'sh-fix-issue-9787-ce' into 'master'
...
Backport commit author changes from CE
See merge request gitlab-org/gitlab-ce!25294
2019-02-15 17:17:27 +00:00
886f00bcba
Backport commit author changes from CE
...
This backports the changes made in EE to fix merge request approvers
from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9574 .
2019-02-15 05:58:23 -08:00
b079a6b6bb
Base pipeline must be from target branch
2019-02-15 10:47:13 +00:00
9671a67a4c
Fix broken specs
2019-02-14 16:33:26 -02:00
30ab6ee416
Check issue milestone availability
...
Add project when creating milestone in specs
We validate milestone is from the same
project/parent group as issuable ->
we need to set project in specs correctly
Improve methods names and specs organization
2019-02-14 15:28:02 +01:00
37741c59a4
Split background migration for issues and merge requests
2019-02-14 11:48:20 -02:00
26f40aefb0
Code improvements
2019-02-13 17:31:14 -02:00
e2aa332504
Improve batch size
2019-02-12 16:39:56 -02:00
e9b84f50e9
Migrate issuable states to integer patch 1
...
Patch 1 that migrates issues/merge requests states from integer to string.
On this commit we are only adding the state_id column and syncing it with a backgroud migration.
On Patch 2 the code to use the new integer column will be deployed and the old column will be
removed.
2019-02-11 15:48:40 -02:00
2b7dd017af
Allow custom squash commit messages
2019-02-06 12:33:11 +00:00
49c74068ae
Save sorting preference for Issues/MRs in BE
...
In order to let users' sorting preferences transfer between devices, we
save the preference for issues and MRs (one preference for issues, one
for MRs) in the backend inside the UserPreference object
2019-01-28 12:48:05 -06:00
8c1991b9bb
Merge branch 'osw-fix-quick-suggestion-application-being-reverted' into 'master'
...
Adjust applied suggestion reverting previous changes
Closes #56017
See merge request gitlab-org/gitlab-ce!24250
2019-01-14 13:46:05 +00:00
6e29368118
Adjust applied suggestion reverting previous changes
...
1. Avoid suggestions being applied on the same file
from reverting previous changes
2. Gracefully use and handle file changes error
when updating the file (though, it does not totally
solves the sync problem for multiple suggestion
applications at once)
2019-01-11 21:35:07 -02:00
1c248cd47c
Fix unexpected exception by failed to find an actual head pipeline
...
Add changelog
2019-01-10 14:02:43 +09:00
a2842241d4
Add committers and authors methods on MergeRequest
...
These are used by the EE-only approvers feature
2019-01-08 00:27:29 +01:00
b6a9dce14e
Make find_actual_head_pipeline private method
...
a
2019-01-04 19:38:45 +09:00
0d9b801a5f
Refactor the logic of updating head pipelines
...
Sort out some logic
2019-01-04 19:36:45 +09:00
7ebd36e302
Prefer to use after_transition
...
Before_transition does not play nice when used with
OptimisticLocking and this can result in triggering
multiple events
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55306
2019-01-02 19:02:46 +01:00
7cf4947792
Cache diff highlight in discussions
...
This commit handles note diffs caching, which considerably improves
the performance on merge requests with lots of comments.
Important to note that the caching approach taken here is different
from `Gitlab::Diff::HighlightCache`. We do not reset the whole cache
when a new push is sent or anything else. That's because discussions
diffs are persisted and do not change.
2018-12-21 16:59:21 -02:00
58ee1746a8
Merge branch 'osw-revert-suggestions-ff' into 'master'
...
Remove feature flag for suggest changes feature
See merge request gitlab-org/gitlab-ce!23892
2018-12-18 15:42:34 +00:00
ee425c9cf8
Remove feature flag for suggest changes feature
2018-12-18 11:18:21 -02:00
0d1922dd7c
Passing an argument to force an association to reload is now deprecated
2018-12-18 13:17:51 +01:00
ed3034bbb7
Allow suggesting single line changes in diffs
2018-12-13 19:17:19 +00:00
e6226e8cb3
Generalise test compare service
...
It adds a base class for CompareTestReportsService
containing common code with CompareLicenseManagementReportsService
which is present in GitLab Enterprise Edition.
2018-12-11 11:39:22 +01:00
1bd7f7cb20
Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'"
...
This reverts commit 793be43b358d0b4872bahttps://gitlab.com/gitlab-org/gitlab-ce/issues/55144 for more details.
2018-12-10 21:18:24 -08:00
4d801a70fb
Inline the new checks into normal update error handling
2018-12-07 12:31:36 +00:00
4a31c6778d
Link to conflicting MR in reopening error message
...
Also, the error message became shorter.
2018-12-06 17:20:08 +00:00
5fd5dad492
Improve error message when attempting to reopen MR and there's a new open MR for the same branch
2018-12-06 17:20:08 +00:00
fab30c117b
Expose merge request pipeline variables
...
Introduce the following variables
- CI_MERGE_REQUEST_ID
- CI_MERGE_REQUEST_IID
- CI_MERGE_REQUEST_REF_PATH
- CI_MERGE_REQUEST_PROJECT_ID
- CI_MERGE_REQUEST_PROJECT_PATH
- CI_MERGE_REQUEST_PROJECT_URL
- CI_MERGE_REQUEST_TARGET_BRANCH_NAME
- CI_MERGE_REQUEST_SOURCE_PROJECT_ID
- CI_MERGE_REQUEST_SOURCE_PROJECT_PATH
- CI_MERGE_REQUEST_SOURCE_PROJECT_URL
- CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
2018-12-06 21:53:23 +09:00
a6778fc647
Rename project's pipelines relation
2018-12-05 14:39:15 +00:00
e62bfc7817
Merge request pipelines
2018-12-05 15:57:52 +09:00
949cc27ac4
Strictly require a pipeline to merge
2018-11-08 13:52:19 +01: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
Mark Chao
Fabio Pitino
Douwe Maan
Yorick Peterse
GitLab Release Tools Bot
Stan Hu
Jasper Maes
Matija Čupić
Heinrich Lee Yu
Sean McGivern
Douglas Barbosa Alexandre
Francisco Javier López
Kamil Trzciński
Felipe Artur
Nathan Friend
Hiroyuki Sato
John Jarvis
Olivier Gonzalez
Jarka Košanová
Luke Duncalfe
Mario de la Ossa
Tiago Botelho
Gilbert Roulot
Akos Gyimesi