283fb71e02
Add latest changes from gitlab-org/gitlab@master
2020-07-17 15:09:13 +00:00
518f1c923d
Add latest changes from gitlab-org/gitlab@master
2020-07-17 12:09:53 +00:00
3a9076e0a4
Add latest changes from gitlab-org/gitlab@master
2020-07-16 18:09:35 +00:00
7d5d23819b
Add latest changes from gitlab-org/gitlab@master
2020-07-15 06:09:35 +00:00
c417764f00
Add latest changes from gitlab-org/gitlab@master
2020-07-07 09:08:57 +00:00
691ed55a05
Add latest changes from gitlab-org/gitlab@master
2020-07-06 18:09:13 +00:00
9fc7cdf0b7
Add latest changes from gitlab-org/gitlab@master
2020-07-06 12:09:00 +00:00
ae1efa2e1d
Add latest changes from gitlab-org/gitlab@master
2020-07-01 15:08:45 +00:00
3aaaf9cd8e
Add latest changes from gitlab-org/gitlab@master
2020-06-29 15:08:56 +00:00
a0b26c6df5
Add latest changes from gitlab-org/gitlab@master
2020-06-29 12:09:20 +00:00
9ce66d4dcf
Add latest changes from gitlab-org/gitlab@master
2020-06-29 09:09:01 +00:00
16210ba9db
Add latest changes from gitlab-org/gitlab@master
2020-06-18 00:08:35 +00:00
0526dc1e68
Add latest changes from gitlab-org/gitlab@master
2020-06-11 12:08:54 +00:00
f3e7bc8060
Add latest changes from gitlab-org/gitlab@master
2020-06-02 18:08:32 +00:00
aebabf8f5a
Add latest changes from gitlab-org/gitlab@master
2020-05-15 00:08:06 +00:00
e689e858ed
Add latest changes from gitlab-org/gitlab@master
2020-05-13 18:08:47 +00:00
0e65189f85
Add latest changes from gitlab-org/gitlab@master
2020-05-13 09:08:37 +00:00
8ff63012e9
Add latest changes from gitlab-org/gitlab@master
2020-05-12 15:10:33 +00:00
c74b7b5e43
Add latest changes from gitlab-org/gitlab@master
2020-04-28 12:09:44 +00:00
fdd0b0fd45
Add latest changes from gitlab-org/gitlab@master
2020-04-23 18:09:46 +00:00
ae96e65ee2
Add latest changes from gitlab-org/gitlab@master
2020-04-22 12:09:29 +00:00
e33f87ac0f
Add latest changes from gitlab-org/gitlab@master
2020-04-21 15:21:10 +00:00
30a8d158a2
Add latest changes from gitlab-org/gitlab@master
2020-04-15 00:09:27 +00:00
874ead9c3a
Add latest changes from gitlab-org/gitlab@master
2020-04-14 15:09:44 +00:00
4dfc871117
Add latest changes from gitlab-org/gitlab@master
2020-04-09 06:09:30 +00:00
7e019504f5
Add latest changes from gitlab-org/gitlab@master
2020-03-26 09:07:52 +00:00
2c156e3c7b
Add latest changes from gitlab-org/gitlab@master
2020-03-17 18:09:44 +00:00
232e0a31f1
Add latest changes from gitlab-org/gitlab@master
2020-03-13 21:09:38 +00:00
7c38405be9
Add latest changes from gitlab-org/gitlab@master
2020-03-10 15:08:08 +00:00
72721699f1
Add latest changes from gitlab-org/gitlab@master
2020-02-18 00:09:20 +00:00
63a015fd85
Add latest changes from gitlab-org/gitlab@master
2020-02-03 18:08:46 +00:00
23288f62da
Add latest changes from gitlab-org/gitlab@master
2020-01-29 15:08:59 +00:00
24256212ea
Add latest changes from gitlab-org/gitlab@master
2020-01-23 21:08:35 +00:00
c859c3bfd2
Add latest changes from gitlab-org/gitlab@master
2020-01-21 15:08:26 +00:00
b24ae1cbc6
Add latest changes from gitlab-org/gitlab@master
2020-01-10 03:07:46 +00:00
f6e985dba4
Add latest changes from gitlab-org/gitlab@master
2020-01-08 06:08:13 +00:00
b8bb2148c2
Add latest changes from gitlab-org/gitlab@master
2019-12-23 09:07:42 +00:00
fc53ce8e6c
Add latest changes from gitlab-org/gitlab@master
2019-12-12 09:07:48 +00:00
6a7cc8c147
Add latest changes from gitlab-org/gitlab@master
2019-12-05 18:07:51 +00:00
eac0da9a47
Add latest changes from gitlab-org/gitlab@master
2019-11-29 15:06:43 +00:00
ea4762d464
Add latest changes from gitlab-org/gitlab@master
2019-11-22 18:06:00 +00:00
eca3cd3a9e
Add latest changes from gitlab-org/gitlab@master
2019-11-15 18:06:24 +00:00
6e81d7f628
Add latest changes from gitlab-org/gitlab@master
2019-11-15 15:06:12 +00:00
90a06a20be
Add latest changes from gitlab-org/gitlab@master
2019-11-07 15:06:33 +00:00
bcdcff7495
Add latest changes from gitlab-org/gitlab@master
2019-11-06 18:06:29 +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
914ea32e0e
Add latest changes from gitlab-org/gitlab@master
2019-10-16 09:07:51 +00:00
4b28d5ae77
Add latest changes from gitlab-org/gitlab@master
2019-10-09 21:06:24 +00:00
538fff823d
Add latest changes from gitlab-org/gitlab@master
2019-09-30 15:08:09 +00:00
2ed368929a
Add latest changes from gitlab-org/gitlab@master
2019-09-24 18:06:05 +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
d8211a0ed1
Add latest changes from gitlab-org/gitlab@master
2019-09-16 09:06:25 +00:00
b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
7698d40550
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2019-08-29 17:17:37 -05:00
e20fb7cb39
Merge branch 'security-mr-head-pipeline-leak' into 'master'
...
Permission fix for MergeRequestsController#pipeline_status
See merge request gitlab/gitlabhq!3274
2019-08-29 21:34:10 +00:00
70818d3d68
Merge branch 'security-ci-metrics-permissions' into 'master'
...
Restrict MergeRequests#test_reports to authenticated users with read-access on Builds
See merge request gitlab/gitlabhq!3329
2019-08-29 21:33:55 +00:00
8db6c4c6e7
Reduce the number of SQL requests on MR-show
...
- Extract MR fields for notes into a separate serializer
- Check if pipelines are empty via count
2019-08-28 21:09:22 +00:00
f7fbf49929
Restrict MergeRequests#test_reports to authenticated users with read-access on Builds
2019-08-22 03:16:32 -04:00
8bcc47ac02
Add SortingPreference concern
...
Sorting preference functionality has been extracted
from `IssuableCollections` to a new `SortingPreference`
concern in order to reuse this functionality in projects
(and groups in the future).
2019-08-21 10:13:45 +00:00
1c7c91806d
Permission fix for MergeRequestsController#pipeline_status
...
- Use set_pipeline_variables to filter for visible pipelines
- Mimic response of nonexistent pipeline if not found
- Provide set_pipeline_variables as a before_filter for other actions
2019-08-12 17:39:32 -04:00
3a178b2610
Merge branch 'security-mr-pipeline-permissions' into 'master'
...
MR pipeline permissions
Closes #2871
See merge request gitlab/gitlabhq!3204
2019-07-26 13:40:59 +00:00
019caa8de5
Use MergeRequest#source_project as permissions reference for MergeRequest#all_pipelines
...
MergeRequest#all_pipelines fetches Ci::Pipeline records from the source
project, so we should specifically check that project for permissions.
This was already happening for intra-project merge requests, but in the
event that the target and source projects both have private builds, we
should ensure that the project permissions are respected.
2019-07-05 11:24:33 -04: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
07559fda51
Extract MR's widget into a separate endpoint
...
This commits extracts /merge_requests/1.json?serializer=widget
Into a separate /merge_requests/1/widget.json endpoint
This will allow to use caching for this request
2019-06-28 10:52:48 +03:00
7821defab3
Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'
...
Automatically update MR merge-ref along merge status
See merge request gitlab-org/gitlab-ce!29569
2019-06-24 09:31:46 +00:00
3016719338
Enable Gitaly ref name caching for discussions.json
...
This eliminates many potential duplicate FindCommit RPCs for the same
ref, which often occurs in the RelativeLinkFilter#current_commit call.
On the GitLab 12.0 release post, for example, this would save close to
400 RPC calls.
2019-06-22 11:31:34 -07: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
b8c1317152
Update merge options for auto merge strategies
...
Currently, merge options is updated on #execute method,
however, we should have #update interface to make it explicit.
2019-06-12 13:20:49 +07:00
00a273d3a9
Revert "Automatically update MR merge-ref along merge status"
2019-06-11 13:08:25 -03: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
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
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
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
f2fa7c3299
Fix and expand Gitaly FindCommit caching
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26248 added
support for deduplicating FindCommit requests using Gitaly ref name
caching. However, not all endpoints were covered, and in one case the
Gitaly wrapper wasn't actually surrounding the serialization step. We
can safely cache ref names between FindCommit calls for #index and #show
endpoints for merge requests and pipelines. This can significantly
reduce the number of FindCommit requests.
2019-04-04 13:42:58 -07:00
db759c5d9c
Allow ref name caching CommitService#find_commit
...
For a given merge request, it's quite common to see duplicate FindCommit
Gitaly requests because the Gitaly CommitService caches the request by
the commit SHA, not by the ref name. However, most of the duplicate
requests use the ref name, so the cache is never actually used in
practice. This leads to unnecessary requests that slow performance.
This commit allows certain callers to bypass the ref name to
OID conversion in the cache. We don't do this by default because it's
possible the tip of the branch changes during the commit, which
would cause the caller to get stale data.
This commit also forces the Ci::Pipeline to use the full ref name
so that caching can work for merge requests.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57083
2019-03-27 14:46:39 -05:00
3b158409b3
Remove expand diff to full file feature flag
2019-03-26 18:20:02 +00:00
16e1b43928
Remove diff tree filtering feature flag
2019-03-18 13:52:26 +00:00
b14de8e1f5
Add option to expand diff to full file
...
The user can also toggle between the diff changes and
the full file diff.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
2019-03-06 15:51:44 +08:00
f03a6574d0
Adds a feature flag to the diff fuzzy file finder
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57403
2019-02-08 14:47:07 +00:00
2b7dd017af
Allow custom squash commit messages
2019-02-06 12:33:11 +00:00
24226b9fe2
Update last_activity_on for Users on some main GET endpoints
...
In order to have an accurate date about the last activity of a User
we need to update the last_activity_on field when the User is visiting
some basic pages of GitLab like pages related to Dashboards, Projects,
Issues and Merge Requests
2019-02-05 09:55:31 -05: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
3a2abc1d50
Enable the Layout/ExtraSpacing cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
5fabc1fd3b
Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'
...
Considerably improve the loading time on merge request's discussion page
Closes #52950
See merge request gitlab-org/gitlab-ce!23857
2018-12-27 10:18:21 +00: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
9f9765485e
Refactor sidebar to use data from serializer
2018-12-19 17:58:53 +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
6ffdab63c5
render :nothing option is deprecated, Use head method to respond with empty response body.
2018-11-23 10:56:14 +01:00
9736eff056
Removes feature flag for ciEnvironmentsStatusChanges
2018-11-12 16:33:59 +00:00
87444fb6ed
Adds pagination to pipelines table in merge request page
2018-10-31 17:10:36 +00:00
43463869c8
Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into 'master'
...
Extract ee specific lines for issues and mr controllers
See merge request gitlab-org/gitlab-ce!22569
2018-10-29 14:06:03 +00:00
dadc046d3a
post merge pipeline and environments status
2018-10-29 11:34:41 +00:00
ac4d838a0a
Extract EE-specific lines from MRs controller
...
Move access checks to their own method so they can be overridden, and
port an EE-only method to exist in CE too, with an EE-specific override.
2018-10-26 14:11:32 +01:00
25170fbe7b
Frontend: Review app changes
2018-10-22 08:31:24 +00:00
4a9efc606f
Move ci_environments_status to a model
...
GET :namespace/merge_requests/:id/ci_environments_status complexity
already reached a limit for a direct serialization from an hash
computed at within the controller function.
Here we introduce a virtual model EnvironmentStatus and its serializer.
2018-10-18 16:12:16 +02:00
dbab210fe7
Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'
...
Removes expensive dead code on main MR page request
Closes #51172
See merge request gitlab-org/gitlab-ce!22153
2018-10-08 18:49:41 +00:00
72273d3d50
Remove dead code on main MR page
2018-10-05 18:56:12 -03:00
7ee8771c5c
Don't build project services unneccesarily
2018-10-04 13:28:52 -05:00
b93f1d3cf8
Merge branch 'security-6881-project-group-approvers-leaks-private-group-info-ce' into 'master'
...
[master] CE: Project group approvers leaks private group info
See merge request gitlab/gitlabhq!2488
2018-10-01 16:45:01 +00:00
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
487ac98a2a
Ports new refactor from EE to CE
2018-09-24 12:02:26 +01:00
81d949f656
Applies the CE backport of EE#657
2018-09-24 12:02:01 +01:00
e7094236a0
Fix mention in edit mr
2018-09-12 16:39:34 +00:00
5138d659b5
Speed up diff comparisons by limiting number of commit messages rendered
...
When a diff has a significant number of commits, the previous behavior would
attempt to render the Markdown on all the commit messages but only display
1000 of them. To avoid additional work, we only need to render the Markdown
on the set that is displayed.
2018-08-22 06:28:31 -07: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
c53de19ff8
Use serializable_hash for compared results
2018-08-03 17:31:03 +09:00
394ea2f9ca
Set polling interval to the header in test_reports endpoint
2018-08-02 18:06:09 +09: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
d79cef3a9a
Support manually stopping any environment from the UI
2018-07-10 08:11:04 +00:00
4ee08b77bc
Updates from `rubocop -a`
2018-07-09 21:13:08 +08:00
3e66795ef1
Changes tab VUE refactoring
2018-06-21 12:22:40 +00:00
c6420ce2ab
Fix milestones disappearing when changed on MR
2018-06-15 17:46:49 -06:00
4775fb9ea7
Render 'invalid' if #target_branch_missing?
2018-06-06 08:18:40 +10:00
d87552a8d6
Rename #check_if_can_be_merged -> #mark_merge_request_mergeable
2018-06-06 08:18:40 +10:00
eb94d36d23
Rename #close_merge_request_without_source_project
...
#close_merge_request_without_source_project -> close_merge_request_if_no_source_project
2018-06-06 08:18:40 +10:00
c8a30e3d83
Adjust permitted params filtering on merge scheduling
2018-05-30 13:19:49 -03:00
4cff66a6c4
Add 'squash and rebase' feature to CE
2018-05-29 20:51:43 +11:00
c6b1043e9d
Resolve "Make a Rubocop that forbids returning from a block"
2018-04-18 09:19:40 +00:00
bc365bd15a
Use persisted/memoized value for MRs shas instead of doing git lookups
2018-03-06 16:05:34 -03:00
c2fc40668c
Refactor IssuableFinder to extract model-specific logic
...
By extracting a new `filter_items` method, we can override that in the
IssuesFinder and MergeRequestsFinder separately, so we don't need checks that
the model is the correct one, because we can just use the class we're in to know
that.
We can do the same for the VALID_PARAMS constant, by making it a class method.
2018-02-21 10:31:29 +00:00
5dd8c05a53
Let CI catch N + 1 calls
2018-02-07 11:29:01 +01:00
cca61980d5
Track and act upon the number of executed queries
...
This ensures that we have more visibility in the number of SQL queries
that are executed in web requests. The current threshold is hardcoded to
100 as we will rarely (maybe once or twice) change it.
In production and development we use Sentry if enabled, in the test
environment we raise an error. This feature is also only enabled in
production/staging when running on GitLab.com as it's not very useful to
other users.
2018-02-01 17:00:46 +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
cba40a1f55
Stop sending milestone and labels data over the wire for MR widget
...
requests
2017-12-15 15:31:16 -02:00
716f9cbb41
tidying up the changes
2017-12-07 09:01:37 -05: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
ab16a6fb34
Optimise getting the pipeline status of commits
...
This adds an optimised way of getting the latest pipeline status for a
list of Commit objects (or just a single one).
2017-11-16 16:01:14 +01:00
bf13746fd8
Merge branch 'dm-notes-for-commit-id' into 'master'
...
Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us
Closes #34509
See merge request gitlab-org/gitlab-ce!15253
2017-11-08 16:04:15 +00:00
fec48c6e17
Use Commit#notes and Note.for_commit_id when possible to make sure we use all the indexes available to us
2017-11-08 12:22:11 +01:00
ad6e650262
Refactor issuables index actions
2017-11-07 14:34:12 +01:00
cd88fa8f80
removed the #ensure_ref_fetched from all controllers
...
also, I refactored the MergeRequest#fetch_ref method to express
the side-effect that this method has.
MergeRequest#fetch_ref -> MergeRequest#fetch_ref!
Repository#fetch_source_branch -> Repository#fetch_source_branch!
2017-11-03 08:13:11 -04:00
064c8949bd
CE port of code changed for epics
2017-11-02 07:14:35 +01:00
6dc9028fbb
Load participants async
2017-10-31 16:15:03 +00:00
64d7ec0a9e
Detect n+1 issues involving Gitaly
2017-09-19 10:55:37 +00:00
1c55b57175
Merge branch '34509-improves-markdown-rendering-performance-for-commits-list' into 'master'
...
Resolve "Projects::CommitsController#show is slow partially due to SQL queries"
Closes #34509
See merge request !13762
2017-09-06 17:14:09 +00:00
6d8e102c74
Adds cacheless render to Banzai object render
2017-09-06 15:35:35 +01:00
966b1128d8
WIP: refactor the first-contributor to Issuable
...
this will remove the need make N queries (per-note) at the
cost of having to mark notes with an attribute
this opens up the possibility for other special roles for notes
2017-09-06 09:00:57 -04:00
42062a454a
Re-use issue/MR counts for the pagination system
...
This changes the issue and MR index pages so the pagination system
re-uses the output of the COUNT(*) query used to calculate the number of
rows per state (opened, closed, etc). This removes the need for an
additional COUNT(*) on both pages.
2017-09-05 11:53:45 +02:00
ffc576d7df
Rename MergeRequest#async_merge to merge_async
2017-08-28 15:55:25 -03:00
4f17c6b763
Track enqueued and ongoing MRs
2017-08-28 15:48:09 -03:00
4edfad9678
Enable Layout/TrailingWhitespace cop and auto-correct offenses
2017-08-15 13:44:37 -04:00
0640b3d1d8
Store MergeWorker JID on merge request, and clean up stuck merges
2017-08-07 15:23:37 -03:00
9aa2205a15
Resolve "Memory usage notice doesn't link anywhere"
2017-07-26 09:31:17 +00:00
706d99aed8
Update Pipeline's badge count in Merge Request and Commits view to match real-time content
2017-07-14 15:52:54 +00:00
fe13f11041
Create and use project path helpers that only need a project, no namespace
2017-07-05 11:11:59 -05:00
GitLab Bot
Robert Speicher
GitLab Release Tools Bot
Igor
drew cimino
George Koltsov
Nick Thomas
Douwe Maan
Stan Hu
Oswaldo Ferreira
Shinya Maeda
Matija Čupić
Phil Hughes
Luke Duncalfe
Rubén Dávila
Mario de la Ossa
Rémy Coutable
Heinrich Lee Yu
Akos Gyimesi
Jasper Maes
Filipa Lacerda
Alessio Caiazza
Sean McGivern
Robert Speicher
Brett Walker
Bob Van Landuyt
gfyoung
Tiago Botelho
Alin Ciciu
Winnie Hellmann
Lin Jen-Shin
Felipe Artur
Ash McKenzie
blackst0ne
🙈 jacopo beschi 🙉
Alejandro Rodríguez
Zeger-Jan van de Weg
Yorick Peterse
Jan Provaznik
micael.bergeron
Felipe Artur
Douwe Maan
Jarka Kadlecova
Eric Eastwood
Andrew Newdigate
micael.bergeron
Tim Zallmann