summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Added rack-timeout for PumaJan Provaznik2019-05-291-0/+46
| | | | | | | It assures that requests are aborted after 60 seconds, otherwise an exception is raised. This exception is logged by Sentry, also there is a Prometheus counter for measuring number of requests in each state.
* CE port of Move EE specific lines in API::ProtectedBranchesImre Farkas2019-05-292-23/+16
|
* Add Puma samplerJan Provaznik2019-05-292-0/+100
| | | | | This sampler gathers Puma-specific metrics which can be used by Prometheus then.
* Updated heading for default state in Web IDEDenys Mishunov2019-05-291-0/+1
| | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/60107
* CE port of Move EE specific lines in API::IssuesImre Farkas2019-05-292-12/+10
|
* Disable proxy in container scanning templatePhilippe Lafoucrière2019-05-291-0/+3
| | | | closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11105
* Merge branch 'auto-devops-kubernestes-bump1-11-10' into 'master'61146-style-tertiary-button-type-to-be-aligned-with-pattern-libraryRobert Speicher2019-05-281-1/+1
|\ | | | | | | | | Bumps Kubernetes in Auto DevOps to 1.11.10 See merge request gitlab-org/gitlab-ce!28525
| * Bumps Kubernetes version to 1.11.10auto-devops-kubernestes-bump1-11-10Thong Kuah2019-05-211-1/+1
| |
* | Add notify_only_default_branch option to PipelinesEmailServicePeter Marko2019-05-281-0/+6
| |
* | Fix order dependency with user params during importsLiam McAndrew2019-05-281-1/+1
| |
* | CE port of Move EE specific lines in API::VariablesImre Farkas2019-05-282-6/+17
| |
* | CE port of Move EE specific lines in API::UsersImre Farkas2019-05-282-8/+20
| |
* | Merge branch 'use-source-ref-name-in-webhook' into 'master'Ash McKenzie2019-05-281-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Use source ref in pipeline webhook Closes #61553 See merge request gitlab-org/gitlab-ce!28772
| * | Use source ref for pipeline webhookuse-source-ref-name-in-webhookShinya Maeda2019-05-281-1/+1
| | | | | | | | | | | | | | | | | | When user uses Pipelines for merge requests, the pipeline is a run on a merge request ref instead of branch ref. However, we should send source ref as a webhook in order to respect the original behavior.
* | | Fix removing empty lines via suggestionsIgor2019-05-281-0/+2
| | | | | | | | | | | | | | | Before this fix, a suggestion which just removes an empty line wasn't appliable
* | | Merge branch 'api_make_protected_boolean_type' into 'master'Jan Provaznik2019-05-281-2/+2
|\ \ \ | | | | | | | | | | | | | | | | protected should be Boolean type See merge request gitlab-org/gitlab-ce!28766
| * | | Make protected attribute Boolean typeapi_make_protected_boolean_typeThong Kuah2019-05-281-2/+2
| |/ / | | | | | | | | | | | | | | | As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/api/project_level_variables.md#create-variable and it's a boolean in `db/schema.rb`
* | | Store Let's Encrypt private key in settingsVladimir Shushlin2019-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storing this key in secrets.yml was a bad idea, it would require users using HA setups to manually replicate secrets across nodes during update, it also needed support from omnibus package * Revert "Generate Let's Encrypt private key" This reverts commit 444959bfa0b79e827a2a1a7a314acac19390f976. * Add Let's Encrypt private key to settings as encrypted attribute * Generate Let's Encrypt private key in database migration
* | | add postgres version to subsequent helm deploysBrandon Dimcheff2019-05-281-0/+1
|/ / | | | | | | If the postgres image version isn't passed to upgrades, helm will revert to the default postgres version. If it crosses incompatible version boundaries, this will break postgres horribly, as it won't be able to read the data files.
* | Merge branch '51854-api-to-get-all-project-group-members-returns-duplicates' ↵Jan Provaznik2019-05-271-17/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "API to get all project/group members returns duplicates" Closes #51854 See merge request gitlab-org/gitlab-ce!24005
| * | Removes duplicated members from api/projects/:id/members/all51854-api-to-get-all-project-group-members-returns-duplicatesJacopo2019-05-271-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | When using the members/all api the same user was returned multiple times when he was a member of the project/group and also of one of the ancestor groups. Now the member is returned only once giving priority to the membership on the project and maintaining the same behaviour of the members UI.
* | | Add no-tabs class and externalize stringsMartin Wortschack2019-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | - Add .no-tabs to login-box - Externalize strings in common signup box - Leverage render_if_exists - Update PO file
* | | CE-port of Refactor EE specific params override in API::GroupsImre Farkas2019-05-272-26/+25
|/ /
* | Merge branch 'chore/remove-circuit-breaker-api' into 'master'Bob Van Landuyt2019-05-272-40/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove the circuit breaker API Closes #52467 See merge request gitlab-org/gitlab-ce!28669
| * | Remove the circuit breaker APIchore/remove-circuit-breaker-apiMarkus Koller2019-05-242-40/+0
| | | | | | | | | | | | | | | The circuit breaker itself was removed in 11.5, this removes the corresponding API endpoints which returned empty data since then.
* | | Merge branch 'variables-boolean-type' into 'master'Jan Provaznik2019-05-271-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Masked should be Boolean type See merge request gitlab-org/gitlab-ce!28758
| * | | Masked should be Boolean typevariables-boolean-typeThong Kuah2019-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/api/project_level_variables.md#create-variable and it's a boolean in `db/schema.rb`
* | | | Add changelog entryJacques Erasmus2019-05-271-0/+23
|/ / / | | | | | | | | | Added a changelog entry for the feature
* | | Merge branch '62151-broken-master' into 'master'Kamil Trzciński2019-05-242-14/+105
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix MySQL CI jobs Closes #62156 and #62151 See merge request gitlab-org/gitlab-ce!28593
| * | Revert "Merge branch 'revert-04c3c6dd' into 'master'"Rémy Coutable2019-05-222-14/+105
| | | | | | | | | | | | | | | This reverts commit 744f1f2e7037f5c70c3168d9e2e89b1c327465d2, reversing changes made to c4d930e5f54e7da07c80cc028dfc0f5c08719146.
* | | Clarify that /copy_metadata only works within same projectWinnie Hellmann2019-05-241-1/+1
| | |
* | | Merge branch 'fix-milestone-references-with-escaped-html-entities' into 'master'Jan Provaznik2019-05-243-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone references with HTML entities in the name Closes #62114 See merge request gitlab-org/gitlab-ce!28667
| * | | Fix milestone references with HTML entities in the namefix-milestone-references-with-escaped-html-entitiesSean McGivern2019-05-243-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a milestone name contained an HTML entity that would be escaped (&, <, >), then it wasn't possible to refer to this milestone by name, or use it in a quick action. This already worked for labels, but not for milestones. We take care to re-escape un-matched milestones, too.
* | | | Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVELLucas Charles2019-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | This env was missing, causing the variable to not be propagated to child containers and thus, be ineffective
* | | | Merge branch '56959-remove-auto-devops-domain-ci-variable' into 'master'Stan Hu2019-05-241-11/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Drop support for AUTO_DEVOPS_DOMAIN See merge request gitlab-org/gitlab-ce!28460
| * | | | Stop emitting AUTO_DEVOPS_DOMAIN Ci variableThong Kuah2019-05-241-11/+1
| | | | | | | | | | | | | | | | | | | | Update documentation to reflect removal
* | | | | Changes RackAttack logger to use structured logsMayra Cabrera2019-05-241-0/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a new filename to register auth logs. This change should allow SRE's queries to make better queries through logging infrastructure. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54528
* | | | Fix OmniAuth OAuth2Generic strategy not loadingStan Hu2019-05-231-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://github.com/rails/rails/commit/83b767ce, Rails 5.1 removed support for using a String to specify a middleware. When the strategy_class argument is passed from the GitLab YAML config to Devise, Devise passes the string value straight through to Rails, and GitLab would crash with a NoMethodError inside ActionDispatch::MiddlewareStack. To make this OmniAuth strategy work again, we normalize the arguments by converting the strategy_class value into an actual Class. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62216
* | | | Merge branch 'api_masked_variables' into 'master'Bob Van Landuyt2019-05-232-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | API: Allow to get and set "masked" attribute for variables Closes #61754 See merge request gitlab-org/gitlab-ce!28381
| * | | API: Allow to get and set "masked" attribute for variablesMathieu Parent2019-05-222-0/+3
| | | |
* | | | Fix issue importing members with owner accessJames Lopez2019-05-231-1/+5
| | | |
* | | | Merge branch '60250-remove-mr_push_options-flag' into 'master'Stan Hu2019-05-222-6/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Remove the mr_push_options feature flag Closes #60250 See merge request gitlab-org/gitlab-ce!28278
| * | | Remove the mr_push_options feature flagLuke Duncalfe2019-05-172-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Gitlab::QueryLimiting.whitelist` has been moved from being inside the feature flag conditional check to the `process_mr_push_options` `Api::Internal` helper. https://gitlab.com/gitlab-org/gitlab-ce/issues/60250
* | | | Fix invalid visibility string comparison in project importStan Hu2019-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves an "ArgumentError: comparison of String with 0 failed" issue where the visibility_level is stored as a string in the project import data because the value comes directly from the Web form. This problem happened upon creating a project from a template or restoring a project. We now cast the value to an integer to guard against these kinds of failures. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61692
* | | | Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'"revert-04c3c6ddKamil Trzciński2019-05-222-105/+14
| | | | | | | | | | | | This reverts merge request !27514
* | | | Merge branch ↵Nick Thomas2019-05-221-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61935-remove-code-left-over-from-when-clusters-were-always-project-specific' into 'master' remove `Clusters::Platforms::Kubernetes#actual_namespace` Closes #61935 See merge request gitlab-org/gitlab-ce!28391
| * | | | Remove legacy Kubernetes #actual_namespace61935-remove-code-left-over-from-when-clusters-were-always-project-specificTiger2019-05-211-2/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Kubernetes clusters were originally built they could only exist at the project level, and so there was logic included that assumed there would only ever be a single Kubernetes namespace per cluster. We now support clusters at the group and instance level, which allows multiple namespaces. This change consolidates various project-specific fallbacks to generate namespaces, and hands all responsibility to the Clusters::KubernetesNamespace model. There is now no concept of a single namespace for a Clusters::Platforms::Kubernetes; to retrieve a namespace a project must now be supplied in all cases. This simplifies upcoming work to use a separate Kubernetes namespace per project environment (instead of a namespace per project).
* | | | Merge branch 'reorganize-tests-jobs-by-level' into 'master'Kamil Trzciński2019-05-222-14/+105
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reorganize test jobs by level See merge request gitlab-org/gitlab-ce!27514
| * | | | Reorganize test jobs by levelreorganize-tests-jobs-by-levelRémy Coutable2019-05-202-14/+105
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementationValery Sizov2019-05-221-41/+1
| | | | | | | | | | | | | | | | | | | | We kept it for smooth update only
View Lorry Controller Status