2d4447808d
Only use Gitaly catfile_cache_size=5 in test
2019-06-06 14:11:44 +00:00
10dcfac1f1
Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"
...
This reverts merge request !28743
2019-06-06 13:57:50 +00:00
3aab750d07
Add certificate valid time to pages domain table
...
Save certificate validity time for pages domains on save
Fill validity time for existing pages domains in background migration
2019-06-06 13:20:15 +00:00
ca7a935159
Fix typo in a changelog description
...
[ci skip]
2019-06-06 12:14:29 +00:00
e882954321
Fix serverless app deployments by bumping `tm` version
...
Previous version of the `tm` tool had a bug that resulted in not being
able to deploy serverless applications using this version.
2019-06-06 12:14:19 +00:00
7f52685a41
Remove build policies from serverless app template
2019-06-06 10:52:29 +00:00
502cbda11b
Merge branch 'ci-variable-expression-con-dis-junction' into 'master'
...
CI variable expression conjunction/disjunction
See merge request gitlab-org/gitlab-ce!27925
2019-06-06 08:34:57 +00:00
f2698e05eb
Backport of 10854-elasticsearch_avoid_db
2019-06-05 14:42:00 -06:00
93d4353be9
Merge branch 'trizzi-master-patch-43016' into 'master'
...
Update maven template with correct link
See merge request gitlab-org/gitlab-ce!29149
2019-06-05 19:47:29 +00:00
c18af25c56
Fix gitaly rspec failures 'too many open files'
2019-06-05 18:30:22 +00:00
d2cc841c55
Add yaml lint
...
This commit adds CI job that validates all `*.yml`
with `yamllint`.
This commit fixes all offenses present in repository.
2019-06-05 16:31:35 +00:00
e7b6dace06
Merge branch '54140-non-ar-cache-commit-markdown' into 'master'
...
Use Redis for CacheMarkDownField on non AR models
Closes #54140
See merge request gitlab-org/gitlab-ce!29054
2019-06-05 16:30:51 +00:00
327c7d5a07
Merge branch 'graphql-file-entry-url' into 'master'
...
Add web_url to tree entry in GraphQL API
See merge request gitlab-org/gitlab-ce!28646
2019-06-05 15:44:53 +00:00
422fa21d0a
Merge branch '11126-fix-repository-size-check-ce' into 'master'
...
Add client code to call GetObjectDirectorySize RPC
See merge request gitlab-org/gitlab-ce!28918
2019-06-05 14:43:37 +00:00
40fd0b9e40
Add client code to call GetObjectDirectorySize RPC
...
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13460
2019-06-05 20:58:46 +08:00
ea12c5aae8
Cleanup #attributes method
...
Since we're prepending the ActiveRecord::Extension module, we
can take advantage of it and avoid using an alias to extend the
original #attributes method.
2019-06-05 20:30:43 +08:00
de21320db2
Remove requirement for id for #markdown_cache_key
...
It's not needed anymore as we require `#cache_key` instead.
2019-06-05 20:06:41 +08:00
d9a761ed14
Merge branch 'bvl-use-global-ids-graphql' into 'master'
...
Use global IDs when exposing GraphQL resources
Closes #62650
See merge request gitlab-org/gitlab-ce!29080
2019-06-05 10:25:22 +00:00
eebdfbc334
Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'
...
Fix connection to Tiller error while uninstalling
Closes #62713
See merge request gitlab-org/gitlab-ce!29131
2019-06-05 09:42:20 +00:00
1f2244f16b
Add multiple extends support
2019-06-05 08:25:55 +00:00
4644a2daf5
Add web_url to tree entry in GraphQL API
2019-06-05 08:46:32 +01:00
56d52340da
Use #cache_key of subject for generated redis key
...
This commit also includes some changes in specs to use
`Class.new` approach.
2019-06-05 14:36:54 +08:00
2eecfd8f9d
Use Redis for CacheMarkDownField on non AR models
...
This allows using `CacheMarkdownField` for models that are not backed
by ActiveRecord.
When the including class inherits `ActiveRecord::Base` we include
`Gitlab::MarkdownCache::ActiveRecord::Extension`. This will cause the
markdown fields to be rendered and the generated HTML stored in a
`<field>_html` attribute on the record. We also store the version
used for generating the markdown.
All other classes that include this model will include the
`Gitlab::MarkdownCache::Redis::Extension`. This add the `<field>_html`
attributes to that model and will generate the html in them. The
generated HTML will be cached in redis under the key
`markdown_cache:<class>:<id>`. The class this included in must
therefore respond to `id`.
2019-06-05 13:19:59 +08:00
cfaac75322
&& and || operators for CI Pipeline expressions.
...
Refactored regex pattern matching to eagerly return tokens
Packaged behind a default-enabled feature flag and added operator documentation.
2019-06-04 19:03:24 -05:00
327cae1da7
Merge branch '61964-unicorn-instrumentation' into 'master'
...
Adds ruby and unicorn instrumentation
Closes #61964
See merge request gitlab-org/gitlab-ce!28499
2019-06-04 17:59:04 +00:00
4c27abb42f
Merge branch 'bump-auto-devops-helm-2-14-0' into 'master'
...
Bump Helm version in Auto-DevOps.gitlab-ci.yml
See merge request gitlab-org/gitlab-ce!28527
2019-06-04 17:06:56 +00:00
4c6b1fc23c
Add comment to clarify system proc stat field
2019-06-04 10:04:36 -06:00
3f1f12645d
Update maven template with correct link
2019-06-04 15:59:31 +00:00
57f9856492
Merge branch 'bvl-design-diff-notes-ce' into 'master'
...
Adjustments related to DiffNotes on diffs outside of a project's main repository
See merge request gitlab-org/gitlab-ce!29023
2019-06-04 14:06:21 +00:00
c7d50ddf55
Fix connection to Tiller error while uninstalling
...
Both the `install-<app>` and `uninstall-<app>` pods loads the
`values-content-configuration-<app>` configmap into the pod
(see `#volume_specification`). This configmap contains the cert
necessary to connect to Tiller. The cert though is only valid for 30
minutes.
So this fixes the bug where the configmap when uninstalling should be
updated as well.
2019-06-05 00:07:47 +12:00
d2ea615415
Merge branch 'trizzi-master-patch-86505' into 'master'
...
Update maven.gitlab-ci.yml for GitLab Package
See merge request gitlab-org/gitlab-ce!28796
2019-06-04 12:01:26 +00:00
d4a83ce5a3
Ignore Puma empty worker stats
...
In some cases (during worker start) it's possible that
Puma.stats returns an empty hash for worker's last status. In
that case we just skip sampling of the worker until these
stats are available.
2019-06-04 09:11:55 +00:00
55e1906df7
Bump Helm version in Auto-DevOps.gitlab-ci.yml
...
See https://github.com/helm/helm/releases/tag/v2.14.0
for upstream changelog
2019-06-04 14:54:57 +12:00
ed503d51a3
Expose IDs in GraphQL as a GlobalID
...
This exposes all fields named `id` as GlobalIDs so they can be used
across our entire GraphQL implementation.
When the objects loaded are `ApplicationRecord`s. We'll use our
existing batchloading to find them. Otherwise, we'll fall back to the
default implementation of `GlobalID`: Calling the `.find` method on
the class.
2019-06-03 21:59:25 +02:00
efca1cb365
Clarify error message and image in yml
2019-06-03 18:00:55 +00:00
e9ae881c9a
Remove unnecessary super call in unicorn sampler
2019-06-03 11:18:54 -06:00
a2c767b9f8
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2019-06-03 10:04:57 -07:00
5906fb2e45
Merge branch 'security-60143-address-xss-issue-master' into 'master'
...
Reject slug+uri concat if slug is deemed unsafe
See merge request gitlab/gitlabhq!3108
2019-06-03 17:01:25 +00:00
2b13462ac4
Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'
...
Persistent XSS in note objects CE
See merge request gitlab/gitlabhq!3075
2019-06-03 17:01:10 +00: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
4504959aa6
Make `resolvable_types` a class method
...
This turns Notable::RESOLVABLE_TYPES into a
`Notable.resolvable_types`. That allows us to override it in EE.
2019-06-03 16:41:05 +02:00
6cb750a2bb
Merge dev.gitlab.org master into GitLab.com master
2019-06-03 14:56:33 +02:00
38e4977dc7
Merge branch 'security-fix_milestones_search_api_leak' into 'master'
...
Resolve: Milestones leaked via search API
Closes #2822
See merge request gitlab/gitlabhq!2997
2019-06-03 12:34:07 +00: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
e5b88d88fb
Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master'
...
Handling password on import by url page
See merge request gitlab/gitlabhq!3061
2019-06-03 12:34:01 +00:00
3a7bf68e34
Merge branch 'dm-http-hostname-override' into 'master'
...
Protect Gitlab::HTTP against DNS rebinding attack
See merge request gitlab/gitlabhq!3071
2019-06-03 12:33:59 +00:00
c45c64ce29
Merge branch 'security-fix-project-existence-disclosure-master' into 'master'
...
Fix url redaction for issue links
See merge request gitlab/gitlabhq!3091
2019-06-03 12:33:57 +00:00
205f0d0cfe
Merge branch 'ac-graphql-stats' into 'master'
...
Add Namespace and ProjectStatistics to GraphQL API
See merge request gitlab-org/gitlab-ce!28277
2019-06-03 11:52:37 +00:00
a7fd826a53
Merge branch 'abstract-auto-merge' into 'master'
...
Refactor and abstract Auto Merge Processes
See merge request gitlab-org/gitlab-ce!28595
2019-06-03 11:24:59 +00:00
6d3ab5d8f6
Merge branch 'ce-fj-11886-fix-port-validation' into 'master'
...
Fix port validations in .gitlab-webide.yml
See merge request gitlab-org/gitlab-ce!29016
2019-06-03 11:07:58 +00:00
Jacob Vosmaer
Nick Thomas
Vladimir Shushlin
Grzegorz Bizon
Kamil Trzciński
Mario de la Ossa
Dmitriy Zaporozhets
Douwe Maan
Stan Hu
Patrick Bajao
Jan Provaznik
Douglas Barbosa Alexandre
Wolphin
Phil Hughes
drew cimino
Bob Van Landuyt
Mayra Cabrera
Ryan Cobb
Tim Rizzi
Thong Kuah
Bob Van Landuyt
Robert Speicher
Yorick Peterse
GitLab Release Tools Bot