3f0e6d9205
More Gitaly cleanup: fetch_ref, allow disk access blocks
2018-07-27 08:43:19 +00:00
13ea4b387d
Merge remote-tracking branch 'dev/master'
2018-07-26 18:30:50 -03:00
33aa3ca8e0
Merge branch 'ce-5158-metrics-alerting' into 'master'
...
Backport 5158-metrics-alerting to CE
See merge request gitlab-org/gitlab-ce!20148
2018-07-26 09:46:55 +00:00
3bcb04f100
Add mutation toggling WIP state of merge requests
...
This is mainly the setup of mutations for GraphQL. Including
authorization and basic return type-structure.
2018-07-25 18:37:12 +02:00
eb7c08c7a6
Backports relevant changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5163 to CE
2018-07-25 09:39:39 +01:00
c8ff6b7c73
Use limit parameter to retrieve Wikis from Gitaly
...
Without this parameter, every load of a Wiki page will load all the Wiki pages
in the repository for the sidebar. This is a significant performance penalty
that can significant slow the display of all Wiki pages.
Relates to #40101
2018-07-24 15:36:31 -07:00
236ed1f2f3
Merge branch 'security-event-counters-private-data' into 'master'
...
[master] Don't expose project names in various counters
See merge request gitlab/gitlabhq!2418
2018-07-24 20:25:25 +00:00
c06e2ac888
Merge branch 'backport-gitlab-database' into 'master'
...
Backport various EE changes to Gitlab::Database
See merge request gitlab-org/gitlab-ce!20809
2018-07-24 16:48:27 +00:00
dffe984d94
Add :sidekiq group to cleanup redis in after callback
2018-07-24 12:23:33 -03:00
2ade035eb2
Backport various EE changes to Gitlab::Database
...
These changes are useful for CE as well. For example, the MR
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20720 can make
use of some of the backported methods.
2018-07-24 13:25:01 +02:00
92802e5107
Merge branch 'blackst0ne-replace-sidekiq-inline-with-perform-enqueued-jobs' into 'master'
...
Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs'
Closes #22991
See merge request gitlab-org/gitlab-ce!20768
2018-07-23 16:09:29 +00:00
82a8903979
Merge branch 'hangouts_chat_integration' into 'master'
...
Hangouts chat integration
See merge request gitlab-org/gitlab-ce!20290
2018-07-23 09:20:16 +00:00
c52ab9141c
Fix gitlab import project load
2018-07-23 07:52:15 +00:00
8bc7845fbf
Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'
...
Resolve "Disable SAML and Bitbucket if OmniAuth is disabled"
Closes #48932
See merge request gitlab-org/gitlab-ce!20608
2018-07-23 07:48:00 +00:00
ddd2a25679
Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs'
...
`perform_enqueued_jobs` is a Sidekiq method.
Using this method violates the Dependency inversion principle[0].
This commit replaces `perform_enqueued_jobs` with ActiveJob's abstract
method `perform_enqueued_jobs` in specs.
[0]: https://en.wikipedia.org/wiki/Dependency_inversion_principle
2018-07-23 15:34:54 +11:00
477f9ed78f
Bring JsonLogger to CE
...
This backports a module that was in EE for Geo so that other modules
can have structured logging support.
2018-07-20 12:50:20 -07:00
6354d55470
Fixing bug with wiki ref in ProjectSearchResults
2018-07-20 13:49:30 +00:00
470e526a20
Merge branch 'fix/gb/fix-deserializing-ci-yaml-variables' into 'master'
...
Fix deserializing YAML variables when a build has been imported
Closes #49406
See merge request gitlab-org/gitlab-ce!20713
2018-07-20 13:01:25 +00:00
d0afab482f
Disable SAML if OmniAuth is disabled
...
We also try to unify the way we setup OmniAuth, and how we check
if it's enabled or not.
2018-07-20 18:54:46 +08:00
fa1ea656f7
Migrate add_remote, remove_remote, fetch_internal_remote to gitaly
2018-07-19 15:07:37 -04:00
805de7fb8d
Add missing Gitaly branch_update nil checks
2018-07-19 17:48:58 +00:00
fd4fd25d3c
Fix passing a hash with string keys when fabricating a variable
2018-07-19 14:13:49 +02:00
3b055baf2b
Merge branch 'sh-normalize-urls' into 'master'
...
Escape username and password in UrlSanitizer#full_url
See merge request gitlab-org/gitlab-ce!20684
2018-07-19 12:06:33 +00:00
f84d3dc0ee
Fix deserializing yaml variables in imported projects
2018-07-19 14:00:35 +02:00
517f33705d
Merge branch '43312-remove_user_activity_workers' into 'master'
...
Delete UserActivities and related workers
Closes #43312
See merge request gitlab-org/gitlab-ce!20597
2018-07-19 10:48:17 +00:00
50ff362650
Escape username and password in UrlSanitizer#full_url
...
If a user uses a password with certain characters (e.g. /, #, +, etc.)
UrlSanitizer#full_url will generate an invalid URL that cannot be
parsed properly by Addressable::URI. If used with UrlBlocker, this
will be flagged as an invalid URI.
2018-07-19 03:14:07 -07:00
68b1e5a97c
Incorporate Gitaly's RefService.FindAllRemoteBranches RPC
2018-07-18 16:48:47 -04:00
c62fce9883
Delete UserActivities and related workers
2018-07-18 15:44:10 +02:00
9348efc6ba
Client implementation for Repository#new_commits
...
After trying to remove the whole method in
8f69014af2902d8d53fe931268bec60f6858f160, this is a more gentle
approach to the method. :)
Prior to this change, new commit detection wasn't implemented in Gitaly,
this was done through: https://gitlab.com/gitlab-org/gitaly/merge_requests/779
As the new implemented got moved around a bit, the whole RevList class
got removed.
Part of https://gitlab.com/gitlab-org/gitaly/issues/1233
2018-07-18 14:46:27 +02:00
1ba47de5fe
Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' into 'master'
...
Improve feedback when a developer cannot push in an empty repository
Closes #27456
See merge request gitlab-org/gitlab-ce!20519
2018-07-18 11:22:25 +00:00
5c651daa97
Remove unreachable Git code
2018-07-18 11:12:57 +00:00
65e5cf0ace
Improves remote message when a developer is unable to push in an empty repository
2018-07-18 09:25:00 +01:00
df04160884
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jivl-dev-master-into-com-master
2018-07-17 17:27:44 -05:00
465da1c7b4
Merge branch 'fix-issue-49133' into 'master'
...
Fix symlink vulnerability in project import
See merge request gitlab/gitlabhq!2440
2018-07-17 22:04:29 +00:00
10bd800297
Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'master'
...
Include full image URL in webhooks for uploaded images
Closes #20720
See merge request gitlab-org/gitlab-ce!18109
2018-07-17 15:57:10 +00:00
fc580935ca
Keep #absolute_image_urls as a private instance method
2018-07-17 14:58:14 +01:00
c093193b1a
Merge branch 'feature/gb/email-delivery-metrics' into 'master'
...
Add emails delivery metrics
Closes #49214
See merge request gitlab-org/gitlab-ce!20638
2018-07-17 08:53:41 +00:00
eda8156e5c
Fix symlink vulnerability in project import
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
2018-07-17 10:30:52 +02:00
a73f480715
Merge branch 'update-issue-closing-pattern' into 'master'
...
Update issue closing pattern
Closes #49166
See merge request gitlab-org/gitlab-ce!20554
2018-07-16 14:46:39 +00:00
dce9599ef5
Implement action mailer delivery metrics observer
2018-07-16 13:40:55 +02:00
37eca76583
Remove Repository#lookup and unreachable rugged code
2018-07-16 10:34:31 +00:00
01ad732f8d
Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master'
...
Resolve "Project exports fail when uploads have been migrated to object storage"
Closes #48745
See merge request gitlab-org/gitlab-ce!20484
2018-07-16 10:28:21 +00:00
e682d94180
Move existing email interceptors into the same module
2018-07-16 11:23:15 +02:00
07d9b036a9
Add dummy Google Hangouts Chat integration
2018-07-14 20:45:04 +09:00
07ec2c7bd0
use fileuploader dynamic path method in uploads manager and add spec
2018-07-13 16:13:13 +02:00
9451c80ac9
Merge branch 'sh-fix-stderr-pipe-consumption' into 'master'
...
Avoid process deadlock in popen by consuming input pipes
Closes gitlab-ee#6895
See merge request gitlab-org/gitlab-ce!20600
2018-07-13 13:14:34 +00:00
fd392cd725
Avoid process deadlock in popen by consuming input pipes
...
A process that spews a lot of output to stderr or stdout could stall out
due to the pipe buffer being full. As described in https://bugs.ruby-lang.org/issues/9082 ,
we can use the trick used in Ruby's capture3 function to read the pipes in separate
threads.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6895
2018-07-12 16:21:30 -07:00
40ed88b784
whitespace
2018-07-12 15:35:24 +02:00
d1d7144b96
Make more ref RPC's mandatory
2018-07-12 15:12:00 +02:00
2f83794d2b
Merge branch 'dz-manifest-import' into 'master'
...
Add manifest import
See merge request gitlab-org/gitlab-ce!20304
2018-07-12 11:50:27 +00:00
Jacob Vosmaer (GitLab)
Felipe Artur
Sean McGivern
Bob Van Landuyt
Tiago Botelho
Stan Hu
Felipe Artur Cardozo
Rémy Coutable
Oswaldo Ferreira
Yorick Peterse
Francisco Javier López
Douwe Maan
blackst0ne
Kamil Trzciński
Lin Jen-Shin
Alejandro Rodríguez
Grzegorz Bizon
Grzegorz Bizon
Imre Farkas
Zeger-Jan van de Weg
Jose
Sean McGivern
Kukovskii Vladimir
James Lopez