0e99daae4a
Use NotesFinder in IssuableActions module
...
Remove project from NotesFinder constructor
Add project parameter to specs
Also look for methods in private scope
Fix specs to match new NotesFinder constructor
2019-08-01 10:42:42 +02:00
fe22704a20
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2019-07-29 13:19:50 -05:00
c41788fe54
Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'"
...
This reverts merge request !29733
2019-07-27 04:28:56 +00:00
7dccb44448
Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'
...
Use NotesFinder to fetch notes in module IssuableActions
Closes #52123
See merge request gitlab-org/gitlab-ce!29733
2019-07-26 22:29:07 +00: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
355a2df560
Use NotesFinder in module IssuableActions
...
Add spec for concern IssuableActions
Add shared samples for discussions endpoint
Add schema validations for discussions
Fix rubocop style issue
Make target assignable
Use new possibility to provide target
2019-07-26 09:10:36 +02:00
41f87e9e99
Removes potentially incorrect, and slow fallback
...
Deployment_platform is relatively expensive and calling this after the
fact means that this may not be the cluster that was deployed to.
Correspondingly reduce the leeway given in the related N+1 spec
2019-07-25 16:46:20 +12:00
7b87ed1499
Cleanup usages of `JSON.parse` in specs
...
Prefer `json_response` where applicable.
2019-07-16 08:03:49 +00:00
af0c054c6d
Resolve Gitaly N+1 for CI/CD environments statuses
2019-07-10 16:36:07 +02:00
49f8697a49
Add additional test case for Gitaly N+1 for diff files
2019-07-10 16:07:14 +02:00
356bf3afff
Add a test for `ci_environments_status` Gitaly N+1
2019-07-10 13:26:42 +02:00
56c1292935
Add retry:0 for controller specs n+1
...
As a workaround for https://gitlab.com/gitlab-org/gitlab-ce/issues/64116
2019-07-08 21:43:35 +12:00
c85d6b0c74
Restore fallback to deployment_platform_cluster
...
In 12.2 we will remove this fallback.
2019-07-08 09:14:37 +12:00
a2cd33d1ba
Could not address last 5 queries
...
Split into followup issue
2019-07-08 09:13:21 +12:00
72339077f7
Add failing test showing N+1
...
We have an N+1 problem where N is environments.
2019-07-08 09:13:21 +12: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
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
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
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
93a44e135b
Add some frozen string to spec/**/*.rb
...
Adds frozen string to the following:
* spec/bin/**/*.rb
* spec/config/**/*.rb
* spec/controllers/**/*.rb
xref https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-04-15 10:17:05 +00: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
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
2b7dd017af
Allow custom squash commit messages
2019-02-06 12:33:11 +00:00
ff0b2cc61f
Re-enable MethodCallWithoutArgsParentheses Cop
...
Re-enables and autocorrects all instances of the
Style/MethodCallWithoutArgsParentheses rule
2019-01-29 21:05:30 +02: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
d99d6494f9
[EE Backport] Add notes filters for epics
2019-01-14 17:20:11 -02:00
d53755da68
Fix deprecation: Using positional arguments in integration tests
2019-01-02 22:33:28 +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
06cef29a62
Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master'
...
Resolve "Create a serializer to render issuables sidebar"
Closes #44984
See merge request gitlab-org/gitlab-ce!23379
2018-12-21 23:30:50 +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
bebc526e3e
Remove deprecated xhr from specs
2018-12-19 23:29:51 +01:00
9f9765485e
Refactor sidebar to use data from serializer
2018-12-19 17:58:53 +08:00
b44a2c801a
Update specs to rails5 format
...
Updates specs to use new rails5 format.
The old format:
`get :show, { some: params }, { some: headers }`
The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
56296f1eda
Remove rails4 specific code
2018-12-16 10:48:41 +01:00
b80dca82f5
Do not save user preferences on read-only mode
2018-12-12 16:15:58 +00: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
b3020aaffd
Squashed commit of the following:
...
commit 931d6ab0e025b0268d94e455f736b09a025e0578
Merge: b34d165320d 93846eb152b5e0527c5df78a5e96e66ce7c483e0aecccfb5110199e1761a56ac84cd80521561b6b32878da0d2922fd7df0214110895967ae75fe7461380fee749429889fcbaa36ac13f345
2018-11-06 10:54:27 +09:00
473262a04b
Merge branch '28249-add-pagination' into 'master'
...
Adds pagination to pipelines table in merge request & commit page
Closes #28249
See merge request gitlab-org/gitlab-ce!22696
2018-11-02 12:09:03 +00:00
733ae94921
Fix typos in comments and specs
2018-11-01 08:59:20 +02:00
87444fb6ed
Adds pagination to pipelines table in merge request page
2018-10-31 17:10:36 +00:00
dadc046d3a
post merge pipeline and environments status
2018-10-29 11:34:41 +00:00
86ead874e2
Resolve "Filter discussion (tab) by comments or activity in issues and merge requests"
2018-10-23 09:49:45 +00:00
f3fba178b9
Remove the `ForkedProjectLink` model
...
This removes the `ForkedProjectLink` model that has been replaced by
the `ForkNetworkMember` and `ForkNetwork` combination. All existing
relations have been adjusted to use these new models.
The `forked_project_link` table has been dropped.
The "Forks" count on the admin dashboard has been updated to count all
`ForkNetworkMember` rows and deduct the number of `ForkNetwork`
rows. This is because now the "root-project" of a fork network also
has a `ForkNetworkMember` row. This count could become inaccurate when
the root of a fork network is deleted.
2018-10-19 11:57:20 +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
cc339aa608
Update spec comment to point to correct issue
2018-10-05 13:47:55 -05:00
Patrick Derichs
Robert Speicher
Stan Hu
GitLab Release Tools Bot
Thong Kuah
Peter Leitzen
Grzegorz Bizon
drew cimino
Shinya Maeda
gfyoung
Oswaldo Ferreira
Luke Duncalfe
Andrew Newdigate
Mario de la Ossa
Rémy Coutable
Felipe Artur
Jasper Maes
Douwe Maan
Mike Greiling
Heinrich Lee Yu
blackst0ne
Felipe Artur
Nick Thomas
Akos Gyimesi
Kamil Trzciński
George Tsiolis
Filipa Lacerda
Alessio Caiazza
Bob Van Landuyt
Robert Speicher
Brett Walker