summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Only use Gitaly catfile_cache_size=5 in testJacob Vosmaer2019-06-061-1/+7
|
* Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"revert-a05f86ceNick Thomas2019-06-061-32/+0
| | | This reverts merge request !28743
* Add certificate valid time to pages domain tableVladimir Shushlin2019-06-061-0/+32
| | | | | Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration
* Fix typo in a changelog descriptionGrzegorz Bizon2019-06-061-8/+2
| | | | [ci skip]
* Fix serverless app deployments by bumping `tm` versionGrzegorz Bizon2019-06-061-1/+1
| | | | | Previous version of the `tm` tool had a bug that resulted in not being able to deploy serverless applications using this version.
* Remove build policies from serverless app templateGrzegorz Bizon2019-06-061-6/+0
|
* Merge branch 'ci-variable-expression-con-dis-junction' into 'master'Kamil TrzciƄski2019-06-0612-56/+204
|\ | | | | | | | | CI variable expression conjunction/disjunction See merge request gitlab-org/gitlab-ce!27925
| * && and || operators for CI Pipeline expressions.drew cimino2019-06-0412-56/+204
| | | | | | | | | | | | Refactored regex pattern matching to eagerly return tokens Packaged behind a default-enabled feature flag and added operator documentation.
* | Backport of 10854-elasticsearch_avoid_dbce-10854-elasticsearch_avoid_dbMario de la Ossa2019-06-051-0/+4
| |
* | Merge branch 'trizzi-master-patch-43016' into 'master'Dmitriy Zaporozhets2019-06-051-2/+2
|\ \ | | | | | | | | | | | | Update maven template with correct link See merge request gitlab-org/gitlab-ce!29149
| * | Update maven template with correct linktrizzi-master-patch-43016Tim Rizzi2019-06-041-2/+2
| | |
* | | Fix gitaly rspec failures 'too many open files'Jacob Vosmaer2019-06-051-0/+1
| | |
* | | Add yaml lintKamil TrzciƄski2019-06-0544-331/+334
| | | | | | | | | | | | | | | | | | | | | This commit adds CI job that validates all `*.yml` with `yamllint`. This commit fixes all offenses present in repository.
* | | Merge branch '54140-non-ar-cache-commit-markdown' into 'master'Douwe Maan2019-06-056-1/+216
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
| * | | Cleanup #attributes method54140-non-ar-cache-commit-markdownPatrick Bajao2019-06-051-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Remove requirement for id for #markdown_cache_keyPatrick Bajao2019-06-051-2/+2
| | | | | | | | | | | | | | | | It's not needed anymore as we require `#cache_key` instead.
| * | | Use #cache_key of subject for generated redis keyPatrick Bajao2019-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | This commit also includes some changes in specs to use `Class.new` approach.
| * | | Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-056-1/+222
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | | Merge branch 'graphql-file-entry-url' into 'master'Nick Thomas2019-06-051-0/+31
|\ \ \ | | | | | | | | | | | | | | | | Add web_url to tree entry in GraphQL API See merge request gitlab-org/gitlab-ce!28646
| * | | Add web_url to tree entry in GraphQL APIPhil Hughes2019-06-051-0/+31
| |/ /
* | | Merge branch '11126-fix-repository-size-check-ce' into 'master'Stan Hu2019-06-052-0/+12
|\ \ \ | | | | | | | | | | | | | | | | Add client code to call GetObjectDirectorySize RPC See merge request gitlab-org/gitlab-ce!28918
| * | | Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-cePatrick Bajao2019-06-052-0/+12
| |/ / | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13460
* | | Merge branch 'bvl-use-global-ids-graphql' into 'master'Jan Provaznik2019-06-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use global IDs when exposing GraphQL resources Closes #62650 See merge request gitlab-org/gitlab-ce!29080
| * | | Expose IDs in GraphQL as a GlobalIDBob Van Landuyt2019-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'Douglas Barbosa Alexandre2019-06-051-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix connection to Tiller error while uninstalling Closes #62713 See merge request gitlab-org/gitlab-ce!29131
| * | | | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Add multiple extends supportWolphin2019-06-052-18/+43
| |_|/ / |/| | |
* | | | Merge branch '61964-unicorn-instrumentation' into 'master'Bob Van Landuyt2019-06-043-21/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds ruby and unicorn instrumentation Closes #61964 See merge request gitlab-org/gitlab-ce!28499
| * | | | Add comment to clarify system proc stat field61964-unicorn-instrumentationRyan Cobb2019-06-041-0/+2
| | | | |
| * | | | Remove unnecessary super call in unicorn samplerRyan Cobb2019-06-031-4/+0
| | | | |
| * | | | Merge branch 'master' into 61964-unicorn-instrumentationRyan Cobb2019-05-2946-305/+426
| |\ \ \ \
| * | | | | Fix typo in system.rbRyan Cobb2019-05-201-1/+1
| | | | | |
| * | | | | Adds ruby and unicorn instrumentationRyan Cobb2019-05-203-17/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds ruby and unicorn instrumentation. This was originally intended in 11.11 but due to performance concerns it was reverted. This new commit foregoes the sys-proctable gem was causing performance issues previously.
* | | | | | Merge branch 'bump-auto-devops-helm-2-14-0' into 'master'Mayra Cabrera2019-06-041-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Bump Helm version in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!28527
| * | | | | Bump Helm version in Auto-DevOps.gitlab-ci.ymlbump-auto-devops-helm-2-14-0Thong Kuah2019-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/helm/helm/releases/tag/v2.14.0 for upstream changelog
* | | | | | Merge branch 'bvl-design-diff-notes-ce' into 'master'Douwe Maan2019-06-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjustments related to DiffNotes on diffs outside of a project's main repository See merge request gitlab-org/gitlab-ce!29023
| * | | | | | Make `resolvable_types` a class methodBob Van Landuyt2019-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This turns Notable::RESOLVABLE_TYPES into a `Notable.resolvable_types`. That allows us to override it in EE.
* | | | | | | Merge branch 'trizzi-master-patch-86505' into 'master'Dmitriy Zaporozhets2019-06-041-59/+15
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Update maven.gitlab-ci.yml for GitLab Package See merge request gitlab-org/gitlab-ce!28796
| * | | | | | Clarify error message and image in ymltrizzi-master-patch-86505Tim Rizzi2019-06-031-3/+4
| | | | | | |
| * | | | | | Update yml file comments re: deployTim Rizzi2019-05-301-4/+4
| | | | | | |
| * | | | | | Update instructions and uncomment out deployTim Rizzi2019-05-301-13/+13
| | | | | | |
| * | | | | | Simplify deploy script and comment out for CETim Rizzi2019-05-301-11/+16
| | | | | | |
| * | | | | | Update maven.gitlab-ci.yml for GitLab PackageTim Rizzi2019-05-271-59/+9
| | | | | | |
* | | | | | | Ignore Puma empty worker statsJan Provaznik2019-06-041-1/+2
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-032-1/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-60143-address-xss-issue-master' into 'master'Robert Speicher2019-06-031-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject slug+uri concat if slug is deemed unsafe See merge request gitlab/gitlabhq!3108
| | * | | | | | Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First reported: https://gitlab.com/gitlab-org/gitlab-ce/issues/60143 When the page slug is "javascript:" and we attempt to link to a relative path (using `.` or `..`) the code will concatenate the slug and the uri. This MR adds a guard to that concat step that will return `nil` if the incoming slug matches against any of the "unsafe" slug regexes; currently this is only for the slug "javascript:" but can be extended if needed. Manually tested against a non-exhaustive list from OWASP of common javascript XSS exploits that have to to with mangling the "javascript:" method, and all are caught by this change or by existing code that ingests the user-specified slug.
| * | | | | | | Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'Robert Speicher2019-06-031-1/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persistent XSS in note objects CE See merge request gitlab/gitlabhq!3075
| | * | | | | | | Change `prohibited_key` to use regexescharlieablett2019-05-011-4/+2
| | | | | | | | |
| | * | | | | | | Add `html` to sensitive wordscharlieablett2019-05-011-1/+1
| | | | | | | | |