summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Rename HELM_EXTRA_ARGS to differentiate between helm invocationstortuetorche/gitlab-ce-patch-auto-deploy-extra-valuesJames Fargher2019-04-171-3/+3
|
* Add HELM_EXTRA_ARGS to all Auto-DevOps helm invocationsJames Fargher2019-04-081-0/+1
|
* Allows extra arguments in helm commands for auto-deploying applicationTortue Torche2019-04-081-0/+2
|
* Handle possible HTTP exception for Sentry clientPeter Leitzen2019-04-071-3/+27
| | | | | | | | | | | Prior this commit exceptions raised during a HTTP request weren't caught by the Sentry client and were passed to the user. In addition the Sentry client tried to catch a non-existent error `Sentry::Client::SentryError`. Now, the Sentry client catches all possible errors coming from a HTTP request.
* Restore original Security/DAST.gitlab-ci.ymlTiger Watson2019-04-063-62/+51
| | | | | Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26520 for Security/DAST.gitlab-ci.yml.
* Merge branch '58612-clean-up-notes-data' into 'master'Stan Hu2019-04-061-8/+11
|\ | | | | | | | | | | | | Clean up `noteable_id` for notes on commits Closes #58612 See merge request gitlab-org/gitlab-ce!26104
| * Clean up `noteable_id` for notes on commits58612-clean-up-notes-dataHeinrich Lee Yu2019-04-061-8/+11
| | | | | | | | | | | | | | This was incorrectly set by a bug in: https://gitlab.com/gitlab-org/gitlab-ce/issues/54924 Also adds a `batch_size` option to `update_column_in_batches`
* | Add Knative metrics to PrometheusChris Baumbauer2019-04-061-0/+39
|/
* Merge branch 'sh-fix-realtime-changes-with-reserved-words' into 'master'Douglas Barbosa Alexandre2019-04-051-11/+12
|\ | | | | | | | | | | | | Fix real-time updates for projects that contain a reserved word Closes #60113 See merge request gitlab-org/gitlab-ce!27060
| * Fix real-time updates for projects that contain a reserved wordStan Hu2019-04-051-11/+12
| | | | | | | | | | | | | | | | | | Projects that included reserved words (e.g. test-create) would fail to generate a proper ETag key because of the name. To fix this, we add forward slashes to match the exact name so that /test-create doesn't get matched, but /create does. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60113
* | Merge branch 'ce-10546-fix-epic-depth-validation' into 'master'Douglas Barbosa Alexandre2019-04-051-10/+52
|\ \ | | | | | | | | | | | | [CE-port] Fix Epic depth validation See merge request gitlab-org/gitlab-ce!26390
| * | Prevent infinite loops in ObjectHierarchyce-10546-fix-epic-depth-validationHeinrich Lee Yu2019-04-051-4/+23
| | |
| * | Adds max_descendants_depth to ObjectHierarchyHeinrich Lee Yu2019-04-051-10/+33
| | | | | | | | | | | | CE-port of 10546-fix-epic-depth-validation
* | | Revert "Merge branch 'bump_kubernetes_1_11_9' into 'master'"Mayra Cabrera2019-04-051-2/+2
| | | | | | | | | | | | This reverts merge request !26991
* | | Merge branch 'duplicate-related-mrs' into 'master'Michael Kozono2019-04-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove duplicates from issue related merge requests See merge request gitlab-org/gitlab-ce!27067
| * | | Remove duplicates from issue related merge requestsduplicate-related-mrsAlexandru Croitor2019-04-051-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Remove duplicates returned by Issues#related_merge_requests API that relies on ReferencedMergeRequestsService which returns 2 arrays one of related MRs and one of related MRs that close the issue(i.e. a subset of first one). We only need related MRs in this case so just pick the first array.
* | | Add part of needed codeGosia Ksionek2019-04-052-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* | | Merge branch 'feature/gb/serverless-switch-to-gitlabktl' into 'master'Kamil Trzciński2019-04-051-5/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Serverless backend now uses `gitlabktl` tool Closes #56252 and #58058 See merge request gitlab-org/gitlab-ce!26926
| * | Build and deploy serverless functions with gitlabktlGrzegorz Bizon2019-04-031-5/+8
| | |
* | | Merge branch 'revert-3962b00b' into 'master'Andreas Brandl2019-04-0510-335/+3
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'" See merge request gitlab-org/gitlab-ce!27051
| * | | Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"Andreas Brandl2019-04-0510-335/+3
| | | | | | | | | | | | This reverts merge request !26823
* | | | Revert "Merge branch 'require-all-templates-to-include-default-stages' into ↵Sean McGivern2019-04-0515-29/+13
|/ / / | | | | | | | | | | | | 'master'" This reverts merge request !26954
* | | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-0510-3/+335
| | | | | | | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* | | Fall back to project repository type by defaultBob Van Landuyt2019-04-052-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-4/+14
|\ \ \ | | | | | | | | | | | | | | | | [CE] Add mutually exclusive labels See merge request gitlab-org/gitlab-ce!26804
| * | | [backend] backport of scoped labelsJan Provaznik2019-04-042-4/+14
| | | | | | | | | | | | | | | | Scoped labels in EE require additional changes in CE code.
* | | | Merge branch 'require-all-templates-to-include-default-stages' into 'master'Sean McGivern2019-04-0515-13/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0515-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'bump_kubernetes_1_11_9' into 'master'Douwe Maan2019-04-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-051-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch '58717-checkbox-cannot-be-checked-if-a-blockquote-is-above' ↵Sean McGivern2019-04-051-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Replaces blockquote fences with \n, keeping the line numbering intact.
* | | | | Add a proxy method to PrometheusClientReuben Pereira2019-04-051-15/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | | Fix IDE detecting MR from fork branchPaul Slaughter2019-04-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** Currently the IDE loads a merge request based on only the `source_branch` name. This means it loads MR's from forks that have the same branch name (not good). - This required updating the BE API to accept `source_project_id`
* | | | | Merge branch '54506-show-error-when-namespace-svc-missing' into 'master'Grzegorz Bizon2019-04-052-1/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show error when namespace/svc account missing Closes #54506 See merge request gitlab-org/gitlab-ce!26362
| * | | | | Display error for unmet prerequisitesjerasmus2019-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Added the ability to display an error for unmet prerequisites
| * | | | | Detailed status for builds that fail prerequisitesTiger2019-04-022-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create FailedUnmetPrerequisites status to allow custom messaging for builds that were unable to be queued due to failing to meet prerequisites (eg. failing to create Kubernetes namespace for deployment).
* | | | | | fix(gitlab-ci-config): allow strings in the 'include' keywordPaul 🐻2019-04-052-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is a followup to !24098 which introduced a validation of the `include:` keyword of a gitlab-ci configuration file when triggered from /ci/lint API calls. However, there was a test case missing: the case of a single string as value. I have added a test case for that which shows that the code was not validating it correctly. This commit fixes that to allow all `include:` valid inputs.
* | | | | | Merge branch ↵Douglas Barbosa Alexandre2019-04-053-2/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | '9217-warn-on-git-fetch-over-ssh-if-the-secondary-is-lagging-the-primary' into 'master' Display console messages, if available See merge request gitlab-org/gitlab-ce!26692
| * | | | | Allow console messages be sent to gitlab-shell9217-warn-on-git-fetch-over-ssh-if-the-secondary-is-lagging-the-primaryAsh McKenzie2019-04-043-2/+12
| | |/ / / | |/| | | | | | | | | | | | | Currently a no-op for CE
* | | | | Merge branch 'drop-usage-of-leagcy-artifacts' into 'master'Kamil Trzciński2019-04-041-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Drop legacy artifacts usage as there are no leftovers See merge request gitlab-org/gitlab-ce!24294
| * | | | Drop legacy artifacts usagedrop-usage-of-leagcy-artifactsShinya Maeda2019-04-041-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Legacy artifacts have been correctly migrated to new place - ci_job_artifacts. Now it's time to remove the related code, but before that we should ensure it doesn't break anything by using feature flag.
* | | | Renamed terminal_specification to channel_specificationFrancisco Javier López2019-04-042-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | We're moving from using terminology related to terminals when we refer to Websockets connections in Workhorse. It's more appropiate a concept like channel.
* | | | Merge branch '57831-allow-graphql-scalar-fields-to-be-authorized' into 'master'Nick Thomas2019-04-041-10/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow GraphQL Scalar-fields to be authorized Closes #57831 See merge request gitlab-org/gitlab-ce!26338
| * | | | Use parent object when authorizing scalar typesBrett Walker2019-04-041-10/+21
| | | | |
* | | | | Allow to sort wiki pages by date and titleIgor2019-04-042-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | - Add controls for sorting by title and date - Execute Gitaly call which now accepts sorting params for wikis
* | | | | Merge branch '58405-basic-limiting-complexity-of-graphql-queries' into 'master'Rémy Coutable2019-04-041-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basic limiting complexity of GraphQL queries Closes #58405 See merge request gitlab-org/gitlab-ce!26629
| * | | | | Initial field and query complexity limits58405-basic-limiting-complexity-of-graphql-queriesBrett Walker2019-04-041-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes all Types::BaseField default to a complexity of 1. Queries themselves now have limited complexity, scaled to the type of user: no user, authenticated user, or an admin user.
* | | | | | Automatically set Prometheus step intervalPeter Leitzen2019-04-041-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By computing the step interval passed to the query_range Prometheus API call we improve the performance on the Prometheus server and GitLab by reducing the amount of data points sent back and prevent Prometheus from sending errors when requesting longer intervals.
* | | | | | Allow to use untrusted Regexp via feature flagKamil Trzciński2019-04-044-14/+47
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings support for untrusted regexp for 'only:refs:' when enabled via feature flag: alllow_unsafe_ruby_regexp. This is by default disabled, and should not be used in production