summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adjust Sidekiq Memory killer shutdown wait time60986-adjust_memory_killerValery Sizov2019-08-203-2/+7
| | | | 30 seconds is not enough for jobs to finish
* Merge branch 'andr3-remove-iamphill-sadly' into 'master'Tim Zallmann2019-08-071-2/+2
|\ | | | | | | | | Remove iamphill from FE Maintainers in codeowners See merge request gitlab-org/gitlab-ce!31484
| * Remove iamphill from FE Maintainers in codeownersandr3-remove-iamphill-sadlyAndré Luís2019-08-051-2/+2
| |
* | Merge branch 'sh-disable-registry-delete' into 'master'Thong Kuah2019-08-073-0/+18
|\ \ | | | | | | | | | | | | Don't attempt to contact registry if it is disabled See merge request gitlab-org/gitlab-ce!31553
| * | Don't attempt to contact registry if it is disabledsh-disable-registry-deleteStan Hu2019-08-063-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21679 moved the deletion of registry tags outside of a transaction, but introduced an issue where Sidekiq would attempt to contact the container registry during project destruction even if it were disabled. Relates to: * https://gitlab.com/charts/gitlab/issues/1455 * https://gitlab.com/gitlab-org/gitlab-ce/issues/45941
* | | Merge branch 'docs/compress-images' into 'master'Rémy Coutable2019-08-07232-0/+0
|\ \ \ | | | | | | | | | | | | | | | | Compress images with pngquant See merge request gitlab-org/gitlab-ce!31566
| * | | Compress images with pngquantAchilleas Pipinellis2019-08-07232-0/+0
|/ / /
* | | Merge branch 'mc/feature/add-at-colon-variable-masking' into 'master'Grzegorz Bizon2019-08-075-5/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow masking @ and : characters Closes #63043 See merge request gitlab-org/gitlab-ce!31065
| * | | Document new masking requirementsmc/feature/add-at-colon-variable-maskingMatija Čupić2019-07-232-2/+3
| | | |
| * | | Add CHANGELOG entryMatija Čupić2019-07-231-0/+5
| | | |
| * | | Allow masking @ and : charactersMatija Čupić2019-07-233-3/+3
| | | |
* | | | Merge branch 'if-64985-redis_pipelined_in_active_session' into 'master'Thong Kuah2019-08-071-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ActiveSession.cleaned_up_lookup_entries to use Redis#pipelined See merge request gitlab-org/gitlab-ce!31096
| * | | | ActiveSession.cleaned_up_lookup_entries to use Redis#pipelinedImre Farkas2019-08-071-2/+4
|/ / / /
* | | | Merge branch 'docs/65499-amend-add-rate-limit-docs' into 'master'Evan Read2019-08-073-18/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65499 Closes #65499 See merge request gitlab-org/gitlab-ce!31458
| * | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65499Russell Dickenson2019-08-073-18/+21
|/ / / /
* | | | Merge branch 'docs/62446-fix-email-nav-path' into 'master'Evan Read2019-08-072-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446 Closes #62446 See merge request gitlab-org/gitlab-ce!31448
| * | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446Russell Dickenson2019-08-072-6/+5
|/ / / /
* | | | Merge branch 'docs/4501-docker-in-docker-19-03-service-fails' into 'master'Evan Read2019-08-071-54/+150
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update DinD example for 19.03.1 See merge request gitlab-org/gitlab-ce!31051
| * | | | Update DinD example for 19.03docs/4501-docker-in-docker-19-03-service-failsSteve Azzopardi2019-08-061-54/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker 19.03 enables TLS by default: ``` Starting in 18.09+, the dind variants of this image will automatically generate TLS certificates in the directory specified by the DOCKER_TLS_CERTDIR environment variable. Warning: in 18.09, this behavior is disabled by default (for compatibility). If you use --network=host, shared network namespaces (as in Kubernetes pods), or otherwise have network access to the container (including containers started within the dind instance via their gateway interface), this is a potential security issue (which can lead to access to the host system, for example). It is recommended to enable TLS by setting the variable to an appropriate value (-e DOCKER_TLS_CERTDIR=/certs or similar). In 19.03+, this behavior is enabled by default. ``` Update the example to use docker over TLS.
* | | | | Merge branch ↵Sean McGivern2019-08-071-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33401-follow-up-from-add-prometheus-metrics-endpoint-and-basic-infrastructure-to-meter-code' into 'master' Clean tmpdirs in metrics endpoint specs Closes #33401 See merge request gitlab-org/gitlab-ce!31529
| * | | | | Clean tmpdirs in metrics endpoint specsPeter Leitzen2019-08-071-1/+8
|/ / / / /
* | | | | Merge branch 'docs-fix-assorted-links' into 'master'Evan Read2019-08-0712-18/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix assorted links in the docs See merge request gitlab-org/gitlab-ce!31559
| * | | | | Fix assorted linksMarcel Amirault2019-08-0712-18/+15
|/ / / / / | | | | | | | | | | | | | | | Fix links as discovered by the lint in the docs project
* | | | | Merge branch 'sh-support-csp-nonce' into 'master'Ash McKenzie2019-08-0717-58/+210
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Content-Security-Policy Closes #65330 See merge request gitlab-org/gitlab-ce!31402
| * | | | | Add support for Content-Security-PolicyStan Hu2019-08-0717-58/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A nonce-based Content-Security-Policy thwarts XSS attacks by allowing inline JavaScript to execute if the script nonce matches the header value. Rails 5.2 supports nonce-based Content-Security-Policy headers, so provide configuration to enable this and make it work. To support this, we need to change all `:javascript` HAML filters to the following form: ``` = javascript_tag nonce: true do :plain ... ``` We use `%script` throughout our HAML to store JSON and other text, but since this doesn't execute, browsers don't appear to block this content from being used and require the nonce value to be present.
* | | | | | Merge branch '52494-separate-namespace-per-project-environment-slug' into ↵Thong Kuah2019-08-0742-542/+968
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Provide separate namespaces for each project environment See merge request gitlab-org/gitlab-ce!30711
| * | | | | | Use separate Kubernetes namespaces per environmentTiger Watson2019-08-0742-542/+968
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kubernetes deployments on new clusters will now have a separate namespace per project environment, instead of sharing a single namespace for the project. Behaviour of existing clusters is unchanged. All new functionality is controlled by the :kubernetes_namespace_per_environment feature flag, which is safe to enable/disable at any time.
* | | | | | Merge branch 'docs-labels-follow-up' into 'master'Evan Read2019-08-071-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up: Tweak line to improve badge placement Closes #65417 See merge request gitlab-org/gitlab-ce!31528
| * | | | | | Follow-up: Tweak line to improve badge placementMarcel Amirault2019-08-071-2/+4
|/ / / / / /
* | | | | | Merge branch 'docs-followup-git-tricks' into 'master'Evan Read2019-08-071-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-Up: Change code blocks to shell type Closes #65605 See merge request gitlab-org/gitlab-ce!31526
| * | | | | | Follow-Up: Change code blocks to shell typeMarcel Amirault2019-08-071-3/+3
|/ / / / / /
* | | | | | Merge branch '60024-remove-restclient-from-prom-client' into 'master'Ash McKenzie2019-08-0717-79/+112
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use Gitlab::HTTP in PrometheusClient instead of RestClient" Closes #60024 See merge request gitlab-org/gitlab-ce!31053
| * | | | | | Convert RestClient to Gitlab::HTTP for Prometheus MonitorDavid Wilkins2019-08-0717-79/+112
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Closes #60024 - Change PrometheusClient.new to accept a base url instead of an already created RestClient - Use Gitlab::HTTP in PrometheusClient instead of creating RestClient in PrometheusService - Move http_options from PrometheusService to PrometheusClient (follow_redirects: false) - ensure that base urls don't have the trailing slash - Created a `PrometheusClient#url` method that might not be strictly required - Change rescued exceptions from RestClient::* to HTTParty::ResponseError where possible and StandardError for the rest
* | | | | | Merge branch 'docs-update-LE-url' into 'master'Evan Read2019-08-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs - Update link in SSL_TLS Certificates Page to Let's Encrypt Intergration See merge request gitlab-org/gitlab-ce!30984
| * | | | | | Docs - Update link in SSL_TLS Certificates Page to Let's Encrypt IntergrationDean Leggo2019-08-071-1/+1
|/ / / / / /
* | | | | | Merge branch 'mc/bug/nil-take' into 'master'remove-duplicate-issue-boards-from-project-export-page-ceStan Hu2019-08-062-19/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix nil take regression Closes #65725 See merge request gitlab-org/gitlab-ce!31554
| * | | | | | Fix nil take regressionmc/bug/nil-takeMatija Čupić2019-08-072-19/+25
|/ / / / / /
* | | | | | Merge branch 'qa-lower-default-cluster-size' into 'master'Dan Davison2019-08-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default number of GCP nodes to 1 See merge request gitlab-org/gitlab-ce!31497
| * | | | | | Default number of GCP nodes to 1Dan Davison2019-08-061-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | By defaulting to 3, there is unnecessary cost involved
* | | | | | Merge branch 'remove-peek-gc' into 'master'Stan Hu2019-08-066-16/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove GC metrics from performance bar Closes gitlab-org/quality/nightly#122 See merge request gitlab-org/gitlab-ce!31550
| * | | | | Remove GC metrics from performance barSean McGivern2019-08-066-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were disabled in production mode, but that also broke the rest of the performance bar. As they were only enabled in development mode, we can just remove them for now.
* | | | | | Merge branch 'jramsay/committer-approval-api' into 'master'Douwe Maan2019-08-061-8/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add committer approval API attribute docs Closes #61796 See merge request gitlab-org/gitlab-ce!31538
| * | | | | | Add committer approval API attributejramsay/committer-approval-apiJames Ramsay2019-08-061-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Requests Approvals can be restricted to prevent the merge request author or merge request committers from self approving. The author restriction is already available in the API, but the committer restriction was not.
* | | | | | | Merge branch 'update-packer-ci-template' into 'master'Douglas Barbosa Alexandre2019-08-062-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Packer.gitlab-ci.yml to use latest image See merge request gitlab-org/gitlab-ce!31548
| * | | | | | | Update Packer.gitlab-ci.yml to use latest imageKelly Hair2019-08-062-1/+6
| | | | | | | |
* | | | | | | | Merge branch '64608-double-tooltips' into 'master'Annabel Dunstone Gray2019-08-063-13/+16
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents showing 2 tooltips in pipelines Closes #64608 See merge request gitlab-org/gitlab-ce!31521
| * | | | | | | Prevents showing 2 tooltips in pipelines64608-double-tooltipsFilipa Lacerda2019-08-063-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In pipeline's table two tooltips were being rendered With this change only one tooltip is trigerred on hover
* | | | | | | | Merge branch '65671-update-mini_magick-to-4.9.5' into 'master'Douwe Maan2019-08-062-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mini_magick to 4.9.5 Closes #65671 See merge request gitlab-org/gitlab-ce!31505
| * | | | | | | | Update mini_magick to 4.9.5Takuya Noguchi2019-08-062-1/+6
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to address CVE-2019-13574 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | Merge branch 'sh-update-nfs-delegation-docs' into 'master'Drew Blessing2019-08-061-0/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Suggest disabling of NFS delegation not needed for RHEL7 update See merge request gitlab-org/gitlab-ce!31546