summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add doc when rspec-set won't workdocs-update-rspec-set-usageHeinrich Lee Yu2019-04-051-2/+4
|
* Merge branch 'docs-run-pipeline-on-merge-ref' into 'master'Marcia Ramos2019-04-054-12/+63
|\ | | | | | | | | | | | | Docs for combined ref pipelines Closes #59495 and gitlab-ee#7380 See merge request gitlab-org/gitlab-ce!26762
| * Docs for use combined merge refs with merge request pipelinesShinya Maeda2019-04-054-12/+63
|/ | | | pdate
* Merge branch 'bvl-fix-git-pull-repo-when-project-does-not-exist' into 'master'Douwe Maan2019-04-055-7/+30
|\ | | | | | | | | | | | | Fall back to project repository type by default Closes #60007 See merge request gitlab-org/gitlab-ce!27003
| * Fall back to project repository type by defaultBob Van Landuyt2019-04-055-7/+30
|/ | | | | | | | | | | | This makes sure that we always have a repository type when trying to parse a repository from a path. This is needed because sometimes we want to perform access checks as if the project already existed, for example when creating a project on push. Before this we were only doing that when accessing git over http, this makes sure it also works correctly when accessing git over SSH
* Merge branch 'keyval-labels' into 'master'Sean McGivern2019-04-0536-99/+573
|\ | | | | | | | | [CE] Add mutually exclusive labels See merge request gitlab-org/gitlab-ce!26804
| * Fix scoped links styling on milestones pageJan Provaznik2019-04-051-2/+1
| |
| * Fix labels selection, escape text in templateskeyval-labelsKushal Pandya2019-04-051-9/+11
| |
| * Fix scoped_labels feature checkJan Provaznik2019-04-044-5/+29
| | | | | | | | | | Check this feature per project/group instead of globally. Also do not show tooltip if it's disabled.
| * [backend] backport of scoped labelsJan Provaznik2019-04-0414-31/+78
| | | | | | | | Scoped labels in EE require additional changes in CE code.
| * [frontend] backport of scoped labelsRajat Jain2019-04-0420-65/+467
| | | | | | | | Scoped labels in EE require additional changes in CE code.
* | Merge branch 'require-all-templates-to-include-default-stages' into 'master'Sean McGivern2019-04-0518-50/+64
|\ \ | | | | | | | | | | | | | | | | | | Require all templates to use default stages Closes #59992 See merge request gitlab-org/gitlab-ce!26954
| * | Require all templates to use default stagesKamil Trzciński2019-04-0518-50/+64
| | | | | | | | | | | | | | | | | | Our templates are free to override the 'stages:'. However, they should follow the convention to always include 'build', 'test', 'deploy' which are defaults when not defined.
* | | Merge branch 'sh-update-rails-5.0.7.2' into 'master'Robert Speicher2019-04-053-36/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Rails to 5.0.7.2 Closes #58963 See merge request gitlab-org/gitlab-ce!27022
| * | | Upgrade globalid and i8n gems to match Rails 5.0.7.2sh-update-rails-5.0.7.2Stan Hu2019-04-041-2/+2
| | | |
| * | | Update Rails to 5.0.7.2Stan Hu2019-04-043-34/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a number of issues as described in https://weblog.rubyonrails.org/releases/. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58963
* | | | 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.
View Lorry Controller Status