summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove spaces from variable namemc/fix/ci-variable-qaMatija Čupić2019-04-051-5/+4
|
* Merge branch 'gitaly-version-v1.32.0' into 'master'Douwe Maan2019-04-052-1/+6
|\ | | | | | | | | Upgrade Gitaly to v1.32.0 See merge request gitlab-org/gitlab-ce!26989
| * Upgrade Gitaly to v1.32.0GitalyBot2019-04-052-1/+6
|/
* Merge branch 'bump_kubernetes_1_11_9' into 'master'Douwe Maan2019-04-053-3/+8
|\ | | | | | | | | Bump Helm to 2.13.1 and kubectl to 1.11.9 See merge request gitlab-org/gitlab-ce!26991
| * Bump Helm to 2.13.1 and kubectl to 1.11.9bump_kubernetes_1_11_9Thong Kuah2019-04-053-3/+8
| |
* | Merge branch '59570-remove-due-date-quick-action' into 'master'Sean McGivern2019-04-052-34/+27
|\ \ | | | | | | | | | | | | | | | | | | Extract remove due date spec to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26922
| * | Extract remove due date spec to shared example59570-remove-due-date-quick-actionAlexandru Croitor2019-04-052-34/+27
| | |
* | | Merge branch '58717-checkbox-cannot-be-checked-if-a-blockquote-is-above' ↵Sean McGivern2019-04-056-3/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Checkbox cannot be checked if preceded by a blockquote Closes #58717 See merge request gitlab-org/gitlab-ce!26937
| * | | Fenced blockquotes to not change source line pos58717-checkbox-cannot-be-checked-if-a-blockquote-is-aboveBrett Walker2019-04-046-3/+49
| | | | | | | | | | | | | | | | | | | | Replaces blockquote fences with \n, keeping the line numbering intact.
* | | | Merge branch '58375-api-controller' into 'master'Sean McGivern2019-04-057-0/+204
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a prometheus proxy API per environment Closes #58375 See merge request gitlab-org/gitlab-ce!26841
| * | | | Use environment_params when defining expected_params58375-api-controllerrpereira22019-04-051-10/+8
| | | | |
| * | | | Allow message strings to be translatedrpereira22019-04-052-2/+8
| | | | |
| * | | | Do not hardcode project and namespace name in urlrpereira22019-04-051-3/+3
| | | | | | | | | | | | | | | | | | | | The names can change in different runs of the spec.
| * | | | Call permit! on paramsrpereira22019-04-052-2/+15
| | | | |
| * | | | Remove permitting of paramsrpereira22019-04-052-21/+5
| | | | | | | | | | | | | | | | | | | | - It is now being done in ProxyService class.
| * | | | Add spec for invalid environment idrpereira22019-04-052-2/+11
| | | | |
| * | | | Make filter params specs more readablePeter Leitzen2019-04-051-5/+7
| | | | |
| * | | | Streamline controller specsPeter Leitzen2019-04-052-87/+76
| | | | |
| * | | | Add a Prometheus API per environmentrpereira22019-04-056-0/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The api will proxy requests to the environment's prometheus server. The Prometheus::ProxyService class can be reused when we add support for group prometheus servers.
| * | | | Some code improvements58375-proxy-servicerpereira22019-04-042-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use strong_memoize for prometheus_adapter since it can be nil in some cases. - Do not phrase spec descriptions with 'should'.
| * | | | Use hash methods to filter paramsrpereira22019-04-042-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | - This is so that we don't have to check that params is of type ActionController::Parameters in ProxyService.
| * | | | Filter params based on the proxy_pathrpereira22019-04-042-32/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Permit params in ProxyService class to avoid having to make changes to both ProxyService and to PrometheusApiController when adding support for more prometheus apis. - Also refactor the cache specs.
| * | | | Rename prometheus_owner to proxyablerpereira22019-04-042-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | - proxyable is a better name for any model object that has a prometheus server to which requests can be proxied.
| * | | | Add spec for RestClient raising exceptionrpereira22019-04-041-47/+37
| | | | |
| * | | | Remove no_proxy check in calculate_reactive_cacherpereira22019-04-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | - It is unlikely that we will stop supporting prometheus APIs that were previously supported.
| * | | | Remove redundant variable declarationPeter Leitzen2019-04-041-2/+1
| | | | |
| * | | | Extract parsing JSONPeter Leitzen2019-04-041-6/+8
| | | | |
| * | | | Start context names with lowercase letterrpereira22019-04-041-7/+7
| | | | |
| * | | | Remove all superfluous bracesrpereira22019-04-042-12/+11
| | | | |
| * | | | Improvements after reviewrpereira22019-04-042-37/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a method for returning a service_unavailable response. - Keep only one spec to test that the prometheus response is returned as-is.
| * | | | Remove unnecessary linerpereira22019-04-041-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | - calculate_reactive_cache does not need to initialize @prometheus_owner again. It's already being initialized in the initialize method.
| * | | | Add a Prometheus::ProxyServicerpereira22019-04-042-0/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The service uses the PrometheusClient.proxy method to call the Prometheus API with the given parameters, and returns the body and http status code of the API response to the caller of the service. - The service uses reactive caching in order to prevent Puma/Unicorn threads from being blocked until the Prometheus API responds.
| * | | | Add a proxy method to PrometheusClientrpereira22019-04-042-20/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also refactor the get and json_api_get methods so that the get method can be reused by the new proxy method. - The new proxy method makes no changes to the request to the prometheus server and response from the prometheus server. This allows it to be used as a proxy to the Prometheus server, hence the name.
* | | | | Merge branch 'ce-proj-settings-ok-avatar-only' into 'master'Kushal Pandya2019-04-0514-46/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Improve project avatar settings See merge request gitlab-org/gitlab-ce!26589
| * | | | | Improve project avatar settingsce-proj-settings-ok-avatar-onlyLuke Bennett2019-03-2814-46/+39
| | | | | | | | | | | | | | | | | | | | | | | | Prioritize and simplify project settings content.
* | | | | | Merge branch ↵Kushal Pandya2019-04-054-8/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59324-queries-which-return-multiple-series-are-not-working-correctly' into 'master' Resolve "Queries which return multiple series are not working correctly" Closes #59323 and #59324 See merge request gitlab-org/gitlab-ce!26514
| * | | | | | Restore multiple series supportAdriel Santiago2019-04-054-8/+74
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Corrects an issue whereby queries which return multiple series results were not rendering as multiple data series on the metrics dashboard
* | | | | | Merge branch '59570-target-branch-quick-action' into 'master'Sean McGivern2019-04-052-78/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract target branch quick action to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26933
| * | | | | | Extract target branch quick action to shared example59570-target-branch-quick-actionAlexandru Croitor2019-04-042-78/+78
| | | | | | |
* | | | | | | Merge branch 'sh-bump-rack-2.0.7' into 'master'Kamil Trzciński2019-04-053-10/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rack gem to 2.0.7 See merge request gitlab-org/gitlab-ce!27033
| * | | | | | | Bump rack gem to 2.0.7sh-bump-rack-2.0.7Stan Hu2019-04-043-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update has two important fixes: 1. It reverts the monkey patch introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23385 since https://github.com/rack/rack/pull/1201 is now part of the release. 2. Preserve forwarded IP address for trusted proxy chains (https://github.com/rack/rack/pull/1343).
* | | | | | | | Merge branch 'fix-merge-request-relations-with-pipeline-on-mwps' into 'master'Kamil Trzciński2019-04-056-17/+77
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MWPS doesn't work for merge request pipelines See merge request gitlab-org/gitlab-ce!26906
| * | | | | | | | Fix merge requst relationships with pipeline in MWPSServicefix-merge-request-relations-with-pipeline-on-mwpsShinya Maeda2019-04-056-17/+77
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MWPSService currently uses the old pipeline lookup method. It searches related merge requests with pipeline.ref, however, this doesn't work for attached/detached merge request pipelines.
* | | | | | | | Merge branch 'extend-cte-optimisations-to-projects' into 'master'Dmitriy Zaporozhets2019-04-057-111/+97
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend CTE search optimisation to projects Closes #55170 See merge request gitlab-org/gitlab-ce!26908
| * | | | | | | | Extend CTE search optimisation to projectsextend-cte-optimisations-to-projectsSean McGivern2019-04-047-111/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we use the `search` param on an `IssuableFinder`, we can run into issues. We have trigram indexes to support these searches. On GitLab.com, we often see Postgres's optimiser prioritise the (global) trigram indexes over the index on `project_id`. For group and project searches, we know that it will be quicker to filter by `project_id` first, as it returns fewer rows in most cases. For group issues search, we ran into this issue previously, and went through the following iterations: 1. Use a CTE on the project IDs as an optimisation fence. This prevents the planner from disregarding the index on `project_id`. Unfortunately it breaks some types of sorting, like priority and popularity, as they sort on a joined table. 2. Use a subquery for listing issues, and a CTE for counts. The subquery - in the case of group lists - didn't help as much as the CTE, but was faster than not including it. We can safely use a CTE for counts as they don't have sorting. Now, however, we're seeing the same issue in a project context. The subquery doesn't help at all there (it would only return one row, after all). In an attempt to keep total code complexity under control, this commit removes the subquery optimisation and applies the CTE optimisation only for sorts we know that are safe. This means that for more complicated sorts (like priority and popularity), the search will continue to be very slow. If this is a high-priority issue, we can consider introducing further optimisations, but this finder is already very complicated and additional complexity has a cost. The group CTE optimisation is controlled by the same feature flag as before, `attempt_group_search_optimizations`, which is enabled by default. The new project CTE optimisation is controlled by a new feature flag, `attempt_project_search_optimizations`, which is disabled by default.
* | | | | | | | | Merge branch 'rubocop_examplewording' into 'master'James Lopez2019-04-05132-505/+505
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autocorrect with RSpec/ExampleWording cop See merge request gitlab-org/gitlab-ce!26817
| * | | | | | | | | Autocorrect with RSpec/ExampleWording copThong Kuah2019-04-05132-505/+505
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rewords examples starting with 'should' - rewords examples starting with 'it' Note: I had to manually fixup "onlies" to "only"
* | | | | | | | | Merge branch '59162-fix-review-apps-initial-seeding' into 'master'Dmitriy Zaporozhets2019-04-056-20/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race condition in ApplicationSettingImplementation.create_from_defaults Closes #59162 See merge request gitlab-org/gitlab-ce!26319
| * | | | | | | | | Fix race cond. in ApplicationSettingImplementation.create_from_defaults59162-fix-review-apps-initial-seedingRémy Coutable2019-04-046-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'update-custom-build-dir-docs' into 'master'Achilleas Pipinellis2019-04-052-2/+98
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for custom build directories See merge request gitlab-org/gitlab-ce!20427