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
7ee8771c5c
Don't build project services unneccesarily
2018-10-04 13:28:52 -05:00
e7094236a0
Fix mention in edit mr
2018-09-12 16:39:34 +00: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
06b8f47cf3
Fix merge request controller spec because to as_json
2018-08-03 18:38:29 +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
3ecc2b04a3
Render MR page when no persisted diff_refs or diffs size
2018-07-18 10:53:19 +01:00
4ee08b77bc
Updates from `rubocop -a`
2018-07-09 21:13:08 +08:00
9214e273a8
Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times
2018-06-19 19:53:51 +02:00
c6420ce2ab
Fix milestones disappearing when changed on MR
2018-06-15 17:46:49 -06:00
290ca339ad
Merge branch 'feature/customizable-favicon' into 'master'
...
Customizable favicon
Closes #15661
See merge request gitlab-org/gitlab-ce!14497
2018-06-07 16:54:41 +00:00
bbafb85395
Add missing tests around rendering invalid merge requests (HTML+JSON)
2018-06-06 08:18:40 +10:00
949c30d42b
remove all .ico favicon variations, use png always
...
the ci status icons are generated client side, wo we don't need the
static files anymore.
2018-06-05 16:20:22 +02: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
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
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
c27c65f97a
Fall back to the `MergeRequestWidgetEntity`
...
When no serializer was passed.
2017-12-21 15:35:54 +01:00
c90415085d
Merge branch '40871-todo-notification-count-shows-notification-without-having-a-todo' into 'master'
...
Resolve "Todo notification count shows notification without having a todo"
Closes #40871
See merge request gitlab-org/gitlab-ce!15807
2017-12-18 15:08:34 +00:00
ef454f68e8
Reset todo counters when the target is deleted
...
When the target is deleted, todos are destroyed, but we did not reset the todo
cache for users with todos on the deleted target. This would only update after
the next time the todo cache was updated for that user.
2017-12-18 12:23:00 +00:00
cba40a1f55
Stop sending milestone and labels data over the wire for MR widget
...
requests
2017-12-15 15:31:16 -02:00
f586dc0735
Check if head_pipeline is correct before merging
2017-12-05 12:54:10 -02:00
906d2f03d1
Refactor issuable destroy action
2017-11-06 13:02:50 +01: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
2f40dac352
Refactor `have_http_status` into `have_gitlab_http_status` in the specs
2017-10-20 10:13:18 +02:00
e8ca579d88
Add a project forks spec helper
...
The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.
2017-10-07 11:46:23 +02:00
2ee93c486c
Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'
...
Reduce method calls while evaluating Projects::MergeRequestsController#show.json
See merge request gitlab-org/gitlab-ce!14285
2017-10-04 07:33:05 +00:00
1f54c9216f
Reduce method calls while evaluating Projects::MergeRequestsController#show.json
2017-10-04 00:09:48 -03:00
7b262c4356
Resolve "Precompiled assets with digest strings are ignored in CI"
2017-10-03 14:47:56 +00:00
65bcd141c8
add controller spec
...
also fix some code styling issues
2017-09-06 09:00:57 -04:00
db17b3c7cd
Merge branch 'rs-issuables-list-metadata-shared-examples' into 'master'
...
Make the 'issuables list meta-data' shared example less dangerous
See merge request !13236
2017-08-02 09:46:11 +00:00
9513bd18c4
Ensure all project factories use `:repository` trait or `:empty_project`
2017-08-01 14:51:52 -04:00
939e9bdde1
Make the 'issuables list meta-data' shared example less dangerous
...
This shared example would take an object's database ID and create a
number of objects based on it. If for some reason the ID were a high
number, like 20, this would create `20 + 21 + 22` objects.
Not only was this dangerous from a performance perspective, it was
entirely unnecessary, as the behavior it was testing is already
well-tested in the unit test for the underlying object. For a controller
test, which is what's including this shared example, all we need to do
is verify that the assigned object contains the correct `id => object`
Hash, which is what we now test for.
2017-08-01 12:55:57 -04:00
abb878326c
Rename many path_with_namespace -> full_path
2017-08-01 07:26:58 +02:00
eafb03cfd5
Remove unnecessary set_flash.now from controller specs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-24 15:21:16 +03: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
70b05a8377
Split up MergeRequestsController
2017-06-28 18:17:44 -05:00
0430b76441
Enable Style/DotPosition Rubocop 👮
2017-06-21 13:48:12 +00:00
a6ec5121f0
Correct RSpec/SingleLineHook cop offenses
2017-06-14 13:18:56 -05:00
34ba80392d
Use :request_store hooks on specs
2017-06-09 18:18:36 -03:00
c3d5faa0ee
Use RequestStore on MR show.json query count spec
2017-06-08 14:03:08 -03:00
d93352825a
redesign caching of application settings
2017-06-06 16:48:10 +00:00
23db8409aa
Skip loading application settings from the database when migrations are pending
...
Various Rails initializers (metrics, sentry, etc) are run before migrations,
which can lead to a mismatch between app/models/application_settings.rb and
schema.
2017-06-02 16:02:08 +01:00
26bcef97d6
Merge branch 'rework-authorizations-performance' into 'master'
...
Rework project authorizations and nested groups for better performance
See merge request !10885
2017-05-29 15:49:56 +00:00
6f4e977046
Merge branch 'issue_32225' into 'master'
...
Add transient head_pipeline_of to pipeline factories
See merge request !11566
2017-05-23 18:53:29 +00:00
Oswaldo Ferreira
Bob Van Landuyt
Robert Speicher
Brett Walker
Alin Ciciu
Shinya Maeda
Lin Jen-Shin
Jasper Maes
Mario de la Ossa
Douwe Maan
Ash McKenzie
Alexis Reigel
blackst0ne
lulalala
Jan Provaznik
Sean McGivern
Felipe Artur
Jarka Kadlecova
Eric Eastwood
Jacopo
Mike Greiling
micael.bergeron
Rémy Coutable
Robert Speicher
Gabriel Mazetto
Dmitriy Zaporozhets
Filipa Lacerda
Douwe Maan
Grzegorz Bizon
Paul Charlton
Nick Thomas