summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change changelog type to performanceallow-reactive-caching-of-nilFabio Pitino2019-07-081-1/+1
|
* Allow ReactiveCaching to support nil valueFabio Pitino2019-07-084-29/+40
| | | | | | | | | | | | When :calculate_reactive_caching returns a nil value this caused ReactiveCaching to schedule a worker every time the code using :with_reactive_cache was called. This issue caused an increasing amount of Sidekiq jobs being created continuously. Implementing this fix behind feature flag :reactive_caching_check_key_exists
* Merge branch '63362-follow-up-from-visual-review-toolbar-docs' into 'master'Achilleas Pipinellis2019-07-082-34/+92
|\ | | | | | | | | | | | | Resolve "Follow-up from "Visual Review Toolbar Docs"" Closes #63362 See merge request gitlab-org/gitlab-ce!30040
| * Refactor the Visual Reviews docsAchilleas Pipinellis2019-07-082-34/+92
|/ | | | Reorganize and better explain what Visual Reviews are
* Merge branch 'run-pipeline-for-merge-train-at-train-ref-ce' into 'master'Kamil Trzciński2019-07-084-0/+56
|\ | | | | | | | | CE Port: Fix race condition of `refs/merge` competing overwrite See merge request gitlab-org/gitlab-ce!30308
| * Fix race condition on merge train ref generationrun-pipeline-for-merge-train-at-train-ref-ceShinya Maeda2019-07-084-0/+56
| | | | | | | | | | | | | | | | | | Today, Pipelines for merge train run on `refs/merge`, however, this causes a race condition that it can be overwritten by CheckMergeabilityService. This patch fixes the problem by generating `refs/train` for those pipelines.
* | Merge branch 'jc-detect-nfs-for-rugged' into 'master'Dmitriy Zaporozhets2019-07-0810-7/+171
|\ \ | | | | | | | | | | | | Use Rugged if we detect storage is NFS and we can access the disk See merge request gitlab-org/gitlab-ce!29725
| * | Use Rugged if we detect storage is NFS and we can access the diskjc-detect-nfs-for-ruggedJohn Cai2019-07-0510-7/+171
| | | | | | | | | | | | | | | Add a module we use as a singleton to determine whether or not rails is able to access the disk
* | | Merge branch '63475-fix-n-1' into 'master'Lin Jen-Shin2019-07-0812-254/+268
|\ \ \ | | | | | | | | | | | | | | | | Reduce N+1 queries in MergeRequestsController#ci_environment_status See merge request gitlab-org/gitlab-ce!30224
| * | | Add retry:0 for controller specs n+163475-fix-n-1Thong Kuah2019-07-081-1/+1
| | | | | | | | | | | | | | | | As a workaround for https://gitlab.com/gitlab-org/gitlab-ce/issues/64116
| * | | BE feedback: memoize deployment_metricsThong Kuah2019-07-081-1/+7
| | | | | | | | | | | | | | | | | | | | Also memoize has_metrics? as well, that might be expensive, and it should not change for the lifetime of EnvironmentStatus
| * | | Restore fallback to deployment_platform_clusterThong Kuah2019-07-083-4/+28
| | | | | | | | | | | | | | | | In 12.2 we will remove this fallback.
| * | | Remove un-used methodThong Kuah2019-07-082-33/+0
| | | | | | | | | | | | | | | | We stopped calling the fallback so we can remove this now
| * | | Could not address last 5 queriesThong Kuah2019-07-081-1/+4
| | | | | | | | | | | | | | | | Split into followup issue
| * | | Extract deployment_metrics into own objectThong Kuah2019-07-088-196/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now share project so that we don't have to load project twice. Also, this extracts non-relevant logic out of Deployment. Update DeploymentsController accordingly
| * | | Share project object in EnvironmentStatusThong Kuah2019-07-083-8/+13
| | | | | | | | | | | | | | | | | | | | Otherwise, each EnvironmentStatus object instantiates its own project when really they are the same. Improves query count performance
| * | | Remove fallback to project.deployment_platformThong Kuah2019-07-083-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves query performance of MergeRequestsController#ci_environments_status a lot. However this means old deployments that deployed to kubernetes clusters with prometheus installations will no longer show performance metrics as we cannot backfill cluster_id from deployment_platform with certainty (clusters may be edited/added/deleted, which changes the results of deployment_platform).
| * | | Add failing test showing N+1Thong Kuah2019-07-081-0/+12
| | | | | | | | | | | | | | | | We have an N+1 problem where N is environments.
* | | | Merge branch 'sh-bump-prometheus-client-mmap-0.9.7' into 'master'Kamil Trzciński2019-07-082-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade prometheus-client-mmap to 0.9.7 See merge request gitlab-org/gitlab-ce!30430
| * | | | Upgrade prometheus-client-mmap to 0.9.7sh-bump-prometheus-client-mmap-0.9.7Stan Hu2019-07-052-3/+3
| | | | | | | | | | | | | | | | | | | | This removes a warning message when prometheus_multiproc_dir is not set.
* | | | | Merge branch 'zj-praefect-config-gitlab-yml' into 'master'Bob Van Landuyt2019-07-081-9/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove a high cardinality Prometheus metric See merge request gitlab-org/gitlab-ce!30122
| * | | | | Remove high cardinality Prometheus metriczj-praefect-config-gitlab-ymlZeger-Jan van de Weg2019-07-051-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The metric was used to correlate Gitaly requests to the Rails controller and action combination. However, Kibana provides better observability in this specific metric, and can handle hig cardinality much better. There's no dashboard in Grafana that currently depends on this metric being exposed.
* | | | | | Merge branch 'docs/enforce-headers-increment-one-level' into 'master'Achilleas Pipinellis2019-07-0813-50/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lint rule that headings must increment one level at a time See merge request gitlab-org/gitlab-ce!30376
| * | | | | | Add lint rule that headings must increment one level at a timeEvan Read2019-07-0813-50/+50
|/ / / / / / | | | | | | | | | | | | | | | | | | Also fixes instances in Markdown that broke the rule.
* | | | | | Merge branch '12632-fix-multiple-discussions' into 'master'Phil Hughes2019-07-085-0/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting a new discussion only on line without Draft note created on it See merge request gitlab-org/gitlab-ce!30413
| * | | | | | Backported EE fix to CENatalia Tepluhina2019-07-085-0/+23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed attribute to be not hyphenated - applied parallel diffs view on CE - separated left and right drafts - added fallback for hasDrafts
* | | | | | Merge branch '40379-CJK-search-min-chars' into 'master'Andreas Brandl2019-07-086-13/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove minimum required characters for fuzzy search if no trigram is used See merge request gitlab-org/gitlab-ce!29810
| * | | | | | Ignore min_chars_for_partial_matching unles trigrm40379-CJK-search-min-charsMario de la Ossa2019-07-046-13/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're not using a trigram index, then ignore the min_chars_for_partial_matching setting
* | | | | | | Merge branch 'docs-brackets-to-parens' into 'master'Achilleas Pipinellis2019-07-08216-647/+647
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Changing badges to use parentheses not brackets See merge request gitlab-org/gitlab-ce!30439
| * | | | | | | Changing badges to use parentheses not bracketsMarcel Amirault2019-07-08216-647/+647
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we used brackets to denote the tier badges, but this made Kramdown, the docs site Markdown renderer, show many warnings when building the site. This is now fixed by using parentheses instead of square brackets. This was caused by [PREMIUM] looking like a link to Kramdown, which couldn't find a URL there. See: - https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/484 - https://gitlab.com/gitlab-org/gitlab-ce/issues/63800
* | | | | | | Merge branch '60213-fix-is-ee-webpack-checks' into 'master'Filipa Lacerda2019-07-0813-41/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace runtime isEE check with compile time one Closes #60213 See merge request gitlab-org/gitlab-ce!30351
| * | | | | | | Replace runtime isEE check with compile time one60213-fix-is-ee-webpack-checksLukas Eipert2019-07-0513-41/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has the benefit that CE bundles will remove dead code in CE only builds. We have a follow-up issue to get rid of this completely: https://gitlab.com/gitlab-org/gitlab-ce/issues/64173
* | | | | | | | Merge branch 'vue-i18n-js-vue-shared-directory' into 'master'Phil Hughes2019-07-0821-56/+138
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/vue_shared directory See merge request gitlab-org/gitlab-ce!30287
| * | | | | | | | Vue-i18n: app/assets/javascripts/vue_shared directoryEzekiel Kigbo2019-07-0821-56/+138
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/vue_shared directory
* | | | | | | | Merge branch 'vue-i18n-js-vue-mr-widget-directory' into 'master'Fatih Acet2019-07-089-46/+117
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/vue_merge_request_widget directory See merge request gitlab-org/gitlab-ce!30035
| * | | | | | | | Vue-i18n: app/assets/javascripts/vue_merge_request_widget directoryEzekiel Kigbo2019-07-089-46/+117
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/vue_merge_request_widget directory
* | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Fatih Acet2019-07-082-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.67.0 See merge request gitlab-org/gitlab-ce!30402
| * | | | | | | | Update dependency @gitlab/svgs to ^1.67.0Lukas Eipert2019-07-052-5/+5
| | | | | | | | |
* | | | | | | | | Merge branch '12533-shared-runners-warning' into 'master'Phil Hughes2019-07-082-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/admin/users/show.html.haml Closes gitlab-ee#12533 See merge request gitlab-org/gitlab-ce!30407
| * | | | | | | | | Removes EE differences12533-shared-runners-warningFilipa Lacerda2019-07-052-1/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch '60856-deleting-binary-file' into 'master'winh-does-jest-failKushal Pandya2019-07-088-17/+88
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Removing an image via Web IDE shows binary data" Closes #60856 See merge request gitlab-org/gitlab-ce!30314
| * | | | | | | | | | Initiate editor for any file without content60856-deleting-binary-fileDenys Mishunov2019-07-055-14/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Important to get file data for any file that has no content set yet: we need this information in order to build a previe for changed/staged files if they were not yet opened in the editor
| * | | | | | | | | | Mark images as binary on initDenys Mishunov2019-07-053-3/+7
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'clusters-group-cte' into 'master'James Lopez2019-07-085-3/+216
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clusters hierarchy CTE See merge request gitlab-org/gitlab-ce!30063
| * | | | | | | | | | Create CTE query for clusters hierarchyThong Kuah2019-07-085-3/+216
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This enables us to use a scope to query all clusters in group hierarchy order in one query, and also enables us to union to instance clusters later. - Handle case where clusters not present at level. In which case the query should go ahead and return the next level's clusters. - Swap with new CTE query behind Feature flag. This FF is default disabled.
* | | | | | | | | | Merge branch 'patch-71' into 'master'Evan Read2019-07-081-3/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description of the optimized path wildcard See merge request gitlab-org/gitlab-ce!30082
| * | | | | | | | | | Description of the optimized path wildcardBlack-Hole2019-07-081-3/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-update-jira-integration' into 'master'Evan Read2019-07-089-20/+22
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update Jira integration See merge request gitlab-org/gitlab-ce!29997
| * | | | | | | | | Refresh screenshotsTristan Williams2019-07-089-20/+22
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Current screenshots are from an older version of Jira and GitLab.
* | | | | | | | | Merge branch 'patch-71' into 'master'Evan Read2019-07-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADD '.git' ending to git clone with CI_JOB_TOKEN for clarity See merge request gitlab-org/gitlab-ce!30200