summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Remove git rake tasksZeger-Jan van de Weg2018-07-312-82/+11
* Merge branch 'sh-simplify-liveness-check' into 'master'Robert Speicher2018-07-301-0/+43
|\
| * Use /-/health instead of breaking /-/livenessStan Hu2018-07-281-4/+4
| * Simplify /-/liveness check to avoid connecting to the databaseStan Hu2018-07-281-0/+43
* | Merge branch '32821-better-error-message-add-invalid-user-to-project' into 'm...Rémy Coutable2018-07-301-1/+4
|\ \
| * | Improve error message when adding invalid user to a projectJacopo2018-07-301-1/+4
| |/
* | Merge branch 'rails5-gpg-permit-concurrent' into 'master'Grzegorz Bizon2018-07-301-2/+10
|\ \
| * | Permit concurrent loads in gpg keychain mutexJasper Maes2018-07-291-2/+10
| |/
* | Merge branch '48098-mutual-auth-cluster-applications' into 'master'Dmitriy Zaporozhets2018-07-307-38/+139
|\ \
| * | Minor style improvements for Helm codeDylan Griffith2018-07-303-4/+12
| * | Use guard clause in Helm::InstallCommandDylan Griffith2018-07-301-6/+6
| * | Expand ca -> certificate_authority in Helm::CertificateDylan Griffith2018-07-301-4/+4
| * | Combine attr_reader in InstallCommand to one lineDylan Griffith2018-07-301-2/+1
| * | Minor refactoring of InitCommand and InstallCommandDylan Griffith2018-07-302-10/+12
| * | Reduce duplication in code in Gitlab::Kubernetes::Helm::CertificateDylan Griffith2018-07-301-30/+23
| * | Ensure CA + Tiller cert never expire and Helm client cert expires quicklyDylan Griffith2018-07-301-3/+6
| * | Get mutual SSL working with helm tillerDylan Griffith2018-07-304-2/+94
| * | Refactor Cluster Application classes to pass through a has of config filesDylan Griffith2018-07-286-34/+38
| |/
* | Merge branch '1499-api-endpoint-for-configuring-pull-mirroring-via-http-ce' i...Grzegorz Bizon2018-07-301-28/+39
|\ \
| * | Backports EE-1499 to CETiago Botelho2018-07-271-28/+39
| |/
* | Merge branch 'master-ce' into artifact-format-v2Shinya Maeda2018-07-304-27/+15
|\ \ | |/
| * Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' ...Sean McGivern2018-07-271-1/+0
| * Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'ma...Sean McGivern2018-07-271-0/+1
| |\
| | * Add instance statistics settings to APIBob Van Landuyt2018-07-271-0/+1
| * | More Gitaly cleanup: fetch_ref, allow disk access blocksJacob Vosmaer (GitLab)2018-07-274-27/+15
* | | Squashed commit of the following:Shinya Maeda2018-07-277-21/+79
|/ /
* | Merge remote-tracking branch 'dev/master'Felipe Artur2018-07-266-21/+3
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/master' into dev-masterStan Hu2018-07-241-1/+1
| |\
| * \ Merge branch 'security-event-counters-private-data' into 'master'Felipe Artur Cardozo2018-07-246-21/+3
| |\ \
| | * | Don't expose project names in various countersYorick Peterse2018-06-216-21/+3
* | | | Merge branch 'ce-5158-metrics-alerting' into 'master'Sean McGivern2018-07-266-17/+25
|\ \ \ \
| * | | | Updates CE backportce-5158-metrics-alertingTiago Botelho2018-07-252-2/+6
| * | | | Move kubeclient and namespace variables to the private interfaceTiago Botelho2018-07-251-2/+2
| * | | | Backports relevant changes made in https://gitlab.com/gitlab-org/gitlab-ee/me...Tiago Botelho2018-07-255-15/+19
* | | | | Merge branch 'bvl-graphql-wip-mutation' into 'master'Douwe Maan2018-07-264-1/+73
|\ \ \ \ \
| * | | | | Add mutation toggling WIP state of merge requestsBob Van Landuyt2018-07-254-1/+73
| |/ / / /
* | | | | Resolve "API endpoint that returns all members, including the inherited membe...🙈 jacopo beschi 🙉2018-07-252-0/+42
|/ / / /
* | | | Merge branch 'sh-use-wiki-limit-parameter-gitaly' into 'master'Sean McGivern2018-07-252-6/+6
|\ \ \ \
| * | | | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitalyStan Hu2018-07-242-6/+6
| |/ / /
* | | | Fix: redirect non-SSL request for gitlab registry to valid URLjelhan2018-07-241-1/+1
| |_|/ |/| |
* | | Fix slow Markdown renderingStan Hu2018-07-241-1/+1
|/ /
* | Merge branch 'backport-gitlab-database' into 'master'Rémy Coutable2018-07-241-0/+26
|\ \
| * | Backport various EE changes to Gitlab::Databasebackport-gitlab-databaseYorick Peterse2018-07-241-0/+26
* | | Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-242-4/+8
|\ \ \
| * | | Remove timeouts for long running requestsZeger-Jan van de Weg2018-07-242-4/+8
| |/ /
* | | Add an option to have a private profile on GitLabJX Terry2018-07-243-7/+9
* | | Make repository cleanup mandatoryZeger-Jan van de Weg2018-07-241-4/+2
|/ /
* | Annotate Gitlab::Git::Repository#fetch_refJacob Vosmaer (GitLab)2018-07-242-0/+5
* | Merge branch 'api-minimal-access-level' into 'master'Robert Speicher2018-07-234-1/+5
|\ \
| * | Add min_access_level filter to projects APIMarko, Peter2018-07-233-0/+3
View Lorry Controller Status