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
67b579c54e
Allow getting all paths (old & new) involved in MR
...
Fetch database columns directly if available
2018-11-07 11:28:43 +08:00
dbc03ce3a9
Optimize merge request refresh by using the database to check commit SHAs
...
Previously for a given merge request, we would:
1. Create the array of commit SHAs involved in the push (A)
2. Request all merge request commits and map the SHA (B)
3. Reload the diff if there were any common commits between A and B
We can avoid additional database querying and overhead by
checking with the database whether the merge request contains any
of the commit SHAs.
Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/53213
2018-11-02 12:11:30 -07:00
dadc046d3a
post merge pipeline and environments status
2018-10-29 11:34:41 +00:00
38f3d59fd0
#13650 added wip search functionality and tests
2018-10-03 08:15:00 +00:00
81d949f656
Applies the CE backport of EE#657
2018-09-24 12:02:01 +01:00
8a72f5c427
Added FromUnion to easily select from a UNION
...
This commit adds the module `FromUnion`, which provides the class method
`from_union`. This simplifies the process of selecting data from the
result of a UNION, and reduces the likelihood of making mistakes. As a
result, instead of this:
union = Gitlab::SQL::Union.new([foo, bar])
Foo.from("(#{union.to_sql}) #{Foo.table_name}")
We can now write this instead:
Foo.from_union([foo, bar])
This commit also includes some changes to make this new setup work
properly. For example, a bug in Rails 4
(https://github.com/rails/rails/issues/24193 ) would break the use of
`from("sub-query-here").includes(:relation)` in certain cases. There was
also a CI query which appeared to repeat a lot of conditions from an
outer query on an inner query, which isn't necessary.
Finally, we include a RuboCop cop to ensure developers use this new
module, instead of using Gitlab::SQL::Union directly.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
2018-09-17 12:39:43 +02:00
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
8fa361b2d9
Squashed commit of the following:
...
commit 610c02c305d9fb3c7d271883450a5fee8b0cf16f
Merge: f2088edb260 84f24dcef0https://gitlab.com/gitlab-org/gitlab-ce into improve-junit-support-be
* 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce :
Add spec for latest
Add spec for merge request
Add spec for cache invalidation
Add spec for pipeline
Add spec
Fix specs
Support corrupted fixtures
Add cache key to error message
commit 7a33a9be724dbde79a24cec77658952ff2d2fa6c
Author: Filipa Lacerda <filipa@gitlab.com>
Date: Tue Aug 7 11:09:56 2018 +0100
Show resolved failures
commit 96b748fbcc00a98a13aeb78f5d97de9cf25035b6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Aug 7 18:50:05 2018 +0900
Add spec for latest
commit 0e8b024169b4b0ac272331117ac2fa821c4052f7
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Aug 7 18:24:38 2018 +0900
Add spec for merge request
commit 8690a699bc98394ad4deebdc91e6690758c5965e
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Aug 7 18:18:55 2018 +0900
Add spec for cache invalidation
commit 97678e1612826af409ca8a04b6c0dc830f7b66c6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Aug 7 18:01:03 2018 +0900
Add spec for pipeline
commit 96c2a698af049e4026c68e74b1f41a265464b2b2
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Aug 7 17:52:21 2018 +0900
Add spec
commit 67bcbd25a3c13abb78ea43c0411f5aed417b87d0
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Aug 7 17:39:02 2018 +0900
Fix specs
commit d7d49def2023f85c07d2718b83f35c8849f65f05
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Aug 7 13:11:07 2018 +0900
Support corrupted fixtures
commit d58dbbc17a7d954db22082615f5331c148c1061b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Aug 7 13:10:47 2018 +0900
Add cache key to error message
commit f6f976216dc36333b5e05e3f0acdfca689350483
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Aug 2 19:07:46 2018 +0900
bring back debaggable fixtures
commit 48a7800e67a718145c0e88c324c0c1f9619e26a4
Merge: 2822b9e8a36 dd627072b3
2018-08-07 23:03:48 +09:00
6b2b89f3cd
Merge branch 'osw-fix-n-plus-1-for-mrs-without-merge-info' into 'master'
...
Avoid N+1 on MRs page when metrics merging date cannot be found
Closes #47613
See merge request gitlab-org/gitlab-ce!21053
2018-08-07 10:38:46 +00:00
49dc8215b4
Avoid N+1 on MRs page when metrics merging date cannot be found
2018-08-06 18:13:36 -03:00
b4415c0174
Merge branch 'issue_44821' into 'master'
...
Retrieve merge request closing issues from database cache
Closes #44821
See merge request gitlab-org/gitlab-ce!20911
2018-08-06 15:44:40 +00:00
fdb5f285f9
Retrieve merge request closing issues from database cache
2018-08-06 11:58:22 -03:00
85af3ea21a
Added unique identifier to calculate_reactive_cache. Decoupled comparison logic to service. Fixed N+1 select queries.
2018-08-03 15:13:39 +09:00
1f53cf7cf0
Merge branch 'master-ce' into artifact-format-v2-with-parser
2018-08-03 14:17:22 +09:00
d867081df1
Simplify the query to fetch base and head pipelines
2018-08-02 19:56:00 +09:00
f20a40f4a1
Merge branch 'frozen-string-enable-app-models' into 'master'
...
Enable frozen string in app/models/*.rb
See merge request gitlab-org/gitlab-ce!20851
2018-08-02 09:11:52 +00:00
b9a9e69d39
Squashed commit of the following:
...
commit 1095f6636db1c9bcd200c9c59e4b14ae70c0884b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Aug 2 14:25:45 2018 +0900
Fix spec
commit dd3e46ee15712b046ca83600c9f2694fbdc3a5f8
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Aug 2 14:14:59 2018 +0900
Fix static analysis
commit 32f46f402b53fc23770224f5c890bd4acfc39e60
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Aug 2 11:34:05 2018 +0900
Add spec for preventing N+1 querires. Add spec for merge request controller.
commit 7e12ef867b3e20bf1d35421a3b82350e9c673962
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Aug 2 10:22:45 2018 +0900
Add spec for test reports comparer serializer
commit 6d69bb297afc90386bb847cf0fd1e75fc377e9d7
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Aug 2 09:27:41 2018 +0900
Remove unnecessary comments
commit aca76ded6abf65d1f54008f9865ec7055f51300c
Merge: f6cf7c1c98b 9812e5dd7cb690c268c2https://gitlab.com/gitlab-org/gitlab-ce into artifact-format-v2-with-parser
* 'artifact-format-v2-with-parser' of https://gitlab.com/gitlab-org/gitlab-ce :
Remove debuggable fixtures
commit dc8744685713a8ab9d3eb7987c7fcf898e8dcd38
Author: Filipa Lacerda <filipa@gitlab.com>
Date: Tue Jul 31 17:49:35 2018 +0100
Removes frontend code
commit 04cd0ed8812f5fdd9cd00540155ec01edc0b42de
Merge: 8003540237e 0295e478b22
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Aug 1 00:13:58 2018 +0900
Merge branch 'artifact-format-v2-with-parser' of gitlab.com:gitlab-org/gitlab-ce into artifact-format-v2-with-parser
commit 8003540237e9070a93ccd1b89a65b1f45ba8234d
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Aug 1 00:13:39 2018 +0900
Remove debuggable fixtures
commit 0295e478b2267c10186c7b9aa9e3bb1bfa8a1b43
Author: Filipa Lacerda <filipa@gitlab.com>
Date: Tue Jul 31 16:12:25 2018 +0100
Fixes broken tests
commit 4fa50ca7fc1e3ab5d0995dc85245fc8ba013d2ce
Author: Filipa Lacerda <filipa@gitlab.com>
Date: Tue Jul 31 10:59:44 2018 +0100
Ports EE css into CE code base
Creates unit tests
Creates code block component
commit 2dc45f714f449bd71b03f34585724e46be9bee4f
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Jul 31 18:20:22 2018 +0900
Remove unnecessary parameters from build#each_test_report
commit 89d7398ae71bff15a397c2b10eb5134e2bc43a7b
Merge: 08d6ac5262c 02e35a0d267758fdf1ad3d2dad449d1f9992625e8b3c7f57b2dc7b4b7bb944dbeccbe144dbeccbe1b60364c0f398eccfc44c9bdc9b1ae69bdc9b1ae6fabf6a5634924146a8d6ba38931d90c2a0a3ab1a
2018-08-02 15:06:39 +09:00
6b2b3d7f49
Resource event model
2018-08-01 08:58:49 +00:00
50abbd3e53
Enable frozen string in app/models/*.rb
...
Partially addresses #47424 .
2018-07-26 16:55:41 -07:00
d907b894be
Fix notify_conflict? raising exception when branches do not exist
...
repository.can_be_merged? can raise error if diff_head_sha or
target_branch are absent, therefore check those explicitly.
2018-07-02 19:42:23 +08:00
ea25fbb8f5
Notify conflict only for opened/locked merge requests
2018-06-25 15:20:29 +00:00
f5ed18e1e3
Delete non-latest merge request diff files upon diffs reload
2018-06-24 18:01:37 -03:00
3e66795ef1
Changes tab VUE refactoring
2018-06-21 12:22:40 +00:00
5b994b8199
Notify only when unmergeable due to conflict
...
There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.
Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.
Remove unmergeable_reason as now only conflict is notified
Update spec
2018-06-20 23:27:17 +08:00
68cb1c2651
Revert rename allow collaboration column
2018-06-08 13:12:51 +00:00
6ced2f1243
Merge branch '42751-rename-mr-maintainer-push' into 'master'
...
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
2018-06-05 15:04:18 +00:00
0d44f4d50e
Rephrase "maintainer" to more precise "members who can merge to the target branch"
...
"Maintainer" will be freed to be used for #42751
2018-06-01 14:33:12 +09:00
272b8dca80
Merge branch 'master' into per-project-pipeline-iid
2018-06-01 14:32:40 +09:00
db92672966
Ensure metrics regardless of being imported on MRs
2018-05-30 12:14:56 -03:00
4cff66a6c4
Add 'squash and rebase' feature to CE
2018-05-29 20:51:43 +11:00
1d20679e9c
Merge branch 'master' into per-project-pipeline-iid
2018-05-28 20:01:56 +09:00
b1ab1609b6
Avoid race condition of re-triggering mark_as_unchecked
2018-05-18 17:02:35 +08:00
953bb41f25
Create TODO when MR became unmergeable
...
Old behavior of creating TODO when
“Merge When Pipeline Succeeds” service fails, is generalized to:
Create a TODO whenever MR became unmergeable
(and similar to notification, MR author and merge_user are both applicable)
2018-05-17 08:54:57 +08:00
dc174e9655
Notify with email when merge request became unmergeable
...
Display MR unmergeable reasons
2018-05-17 08:54:51 +08:00
179a1ee7c6
Add MergeRequest#merge_participants
...
For notifying via todo or email.
2018-05-17 08:54:47 +08:00
7517105303
Add cannot_be_merged_recheck merge_status
...
First, transitions between can_be_merged & cannot_be_merged are removed,
as they are currently blocked in `check_if_can_be_merged`.
`can_be_merge` always returns to `unchecked` first,
before it can transition to `cannot_be_merged` (and vice versa).
We want to avoid repeated notification triggered by repeated transition
between `cannot_be_merged` & `unchecked`.
So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
but as a mean to remember it’s from cannot_be_merged.
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407
Since `unchecked` and `cannot_be_merged_recheck` both mean
“we are in the middle of checking if it is mergeable”,
quite often we need to see if merge_status is in either one of them,
so `check_state?` is added to achieve this.
2018-05-17 08:54:47 +08:00
a74184eb5e
Fix static analysys
2018-05-11 16:52:48 +09:00
0af2ab18fa
Decouple to_params from AtomicInternalId concern
2018-05-08 14:57:41 +09:00
3063225ca2
Display merge commit SHA in merge widget after merge
2018-05-07 14:09:47 -03:00
5a7fbb8d89
[Rails5] Fix params passed to MergeWorker
2018-05-03 08:52:51 +00:00
9ea2fc85a3
Atomic internal ids for all models
2018-04-20 14:00:15 +00:00
39c9928cfb
Fix N+1 in `MergeRequest#merge_request_diff_for`
...
Previously, this would issue a query for each unique `diff_refs_or_sha`
passed. This was because we didn't want to load other MR diffs into memory, as
they had some very large columns.
Now they are actually very small, and it's more efficient to just load them all
at once and do the finding in Ruby.
2018-03-21 17:24:46 +00:00
a0abb90478
Deprecate InternalId concern and rename.
2018-03-16 13:35:25 +01:00
6cd7f679d0
Only cache highlight results for latest MR diffs
...
Previously, we kept them all in the cache. We don't need the highlight results
for older diffs - if someone does view that (which is rare), we can do the
highlighting on the fly.
2018-03-15 11:49:53 +00:00
cfa9d1ed6b
Only allow users that can merge to push to source
...
We only allow users that can merge the merge request to push to the
fork.
2018-03-07 17:00:50 +01:00
792ab0631c
Allow a user to select `allow maintainer to push`
...
When a project is not private, and the source branch not protected the
user can now select the option to allow maintainers to push to this
branch
2018-03-07 15:12:31 +01:00
bc365bd15a
Use persisted/memoized value for MRs shas instead of doing git lookups
2018-03-06 16:05:34 -03:00
9a323c7e1f
Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly
...
MergeRequest#rebase_in_progress? and MergeRequest#rebase_path were called
twice each time per request. This memoization helps reduce the overall number
of queries.
See https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51616319 as a failing
job.
Closes gitlab-org/gitlab-ee#4857
2018-02-08 10:28:50 +00:00
dbfedb5adb
Check MR state before submitting queries for discussion state
2018-01-29 23:53:47 -02:00
f0df45fb8a
Fix MR revert check when no merged_at is present
2018-01-29 10:49:14 +00:00
b02f9b6141
Look at notes created just before merge when deciding if an MR can be reverted
...
On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds,
while `MergeRequest::Metrics#merged_at` does. This breaks the optimization
assumption that we only need to search for notes created *after* the MR has
been merged.
Unsynchronized system clocks also make this a dangerous assumption to make.
Adding a minute of leeway still optimizes away most notes, but allows both
cases to be handled more gracefully. If the system clocks are more than a
minute out, we'll still be broken, of course.
2018-01-25 11:39:46 +00:00
a7d26f00c3
Display related merge requests in commit detail page
2018-01-12 20:38:36 +00:00
6438a1afa7
Merge branch '41807-15665-consistently-502s-because-it-fetches-every-commit' into 'master'
...
Resolve "!15665 consistently 502s because it fetches every commit"
Closes #41807
See merge request gitlab-org/gitlab-ce!16320
2018-01-12 15:47:50 +00:00
f3cf8cc8d1
Only search for MR revert commits on notes after MR was merged
...
If we search for notes before the MR was merged, we have to load every commit
that was ever part of the MR, or mentioned in a push. In extreme cases, this can
be tens of thousands of commits to load, but we know they can't revert the merge
commit, because they are from before the MR was merged.
In the (rare) case that we don't have a `merged_at` value for the MR, we can
still search all notes.
2018-01-12 13:19:05 +00:00
729f05f0e3
Adds Rubocop rule for line break around conditionals
2018-01-11 16:34:01 +00:00
d0b8f536a1
Remove soft removals related code
...
This removes all usage of soft removals except for the "pending delete"
system implemented for projects. This in turn simplifies all the query
plans of the models that used soft removals. Since we don't really use
soft removals for anything useful there's no point in keeping it around.
This _does_ mean that hard removals of issues (which only admins can do
if I'm not mistaken) can influence the "iid" values, but that code is
broken to begin with. More on this (and how to fix it) can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/31114 .
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
2018-01-08 17:04:45 +01:00
27a75ea175
Backport 'Rebase' feature from EE to CE
...
When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.
This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)
Closes #40301
2018-01-05 09:34:59 +01:00
b0bc676f20
Merge branch 'zj-mr-diff-memoization-bug' into 'master'
...
Clear caches before updating MR diffs
See merge request gitlab-org/gitlab-ce!15916
2017-12-14 13:27:00 +00:00
8ad412559d
Clear caches before updating MR diffs
...
The hook ordering influenced the diffs being generated as these used
values from before the update due to the memoization still being in
place. This commit reorders them and tests against this behaviour.
2017-12-14 11:22:34 +01:00
9d0fc98c7d
Merge branch '33926-update-issuable-icons' into 'master'
...
Update issuable status icons
Closes #33926
See merge request gitlab-org/gitlab-ce!15898
2017-12-13 19:14:38 +00:00
013e681625
Merge branch 'issue_41021' into 'master'
...
Prevent worker that updates merge requests head pipeline from failing jobs
Closes #41021
See merge request gitlab-org/gitlab-ce!15870
2017-12-13 16:45:48 +00:00
504f77b43a
Prevent worker that updates merge requests head pipeline from failing jobs
2017-12-13 13:36:52 -02:00
a5439897d2
Update issuable status icons
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926
Changed file icons already addressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
2017-12-13 00:11:57 -06:00
3ab026b7d6
Use memoization for commits on diffs
...
The Gitaly CommitService is being hammered by n + 1 calls, mostly when
finding commits. This leads to this gRPC being turned of on production:
https://gitlab.com/gitlab-org/gitaly/issues/514#note_48991378
Hunting down where it came from, most of them were due to
MergeRequest#show. To prove this, I set a script to request the
MergeRequest#show page 50 times. The GDK was being scraped by
Prometheus, where we have metrics on controller#action and their Gitaly
calls performed. On both occations I've restarted the full GDK so all
caches had to be rebuild.
Current master, 806a68a81f
2017-12-12 16:28:26 +01:00
360b94ceba
adding view and feature specs
2017-12-07 09:06:59 -05:00
16c8b91092
revert the `#all_pipelines` method to use the pluck
...
the `ci_pipelines.sha` column is not the same type than the
`merge_request_diff_commits.sha` column (varchar, bytea)
2017-12-07 09:02:42 -05:00
cb6f51ec9b
add support for the commit reference filter
2017-12-07 09:01:37 -05:00
716f9cbb41
tidying up the changes
2017-12-07 09:01:37 -05:00
3d8fbd12b8
add support for commit (in mr) to reference filter
2017-12-07 09:01:27 -05:00
856447ccd3
Throttle the number of UPDATEs triggered by touch
...
This throttles the number of UPDATE queries that can be triggered by
calling "touch" on a Note, Issue, or MergeRequest. For Note objects we
also take care of updating the associated "noteable" relation in a
smarter way than Rails does by default.
2017-12-06 15:59:37 +01:00
5cf3ff27c8
Use actual head pipeline on merge request serializer
2017-12-05 12:54:10 -02:00
f586dc0735
Check if head_pipeline is correct before merging
2017-12-05 12:54:10 -02:00
8f78ba554d
Improve MergeRequest#head_pipeline
2017-12-05 12:54:10 -02:00
fe673b4927
Ensure pippeline corresponds with the sha of an MR
2017-12-05 12:54:10 -02:00
4925ec5087
We could simply count the commits
2017-11-30 16:03:28 +08: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
Alessio Caiazza
Chantal Rollison
Sean McGivern
Rémy Coutable
gfyoung
Felipe Artur
Robert Speicher
blackst0ne
lulalala
Alejandro Rodríguez
🙈 jacopo beschi 🙉
Zeger-Jan van de Weg
Annabel Dunstone Gray
Eric Eastwood
micael.bergeron
Lin Jen-Shin