Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-21Clean up roulette testingrefactor-roulette-testingAlex Kalderimis
This factors out the IO into its own testable module. The advantage of this is that we can easily instantiate versions of the plugin that have different team sources, without extensive mocking. This proved to be necessary to test an update to the `roulette.json` production in the handbook.
2019-06-21Merge branch 'docs-prometheus-service-discovery' into 'master'Achilleas Pipinellis
Documentation for Prometheus Service Discovery Closes #63110 See merge request gitlab-org/gitlab-ce!29811
2019-06-21Adding documentation for Prometheus Service DiscoveryAric Buerer
Updating documentation to include Prometheus Service Discovery. Added monitoring node documentaiton as well as documentation for the individual service nodes.
2019-06-21Merge branch 'sh-clean-up-bitbucket-import-errors' into 'master'Douglas Barbosa Alexandre
Avoid storing backtraces from Bitbucket Cloud imports in the database See merge request gitlab-org/gitlab-ce!29862
2019-06-21Merge branch '58065-uniform-html-txt-email' into 'master'Sean McGivern
Make HTML and text emails for new issues uniform and add the mail to mailer previews Closes #58065 See merge request gitlab-org/gitlab-ce!29886
2019-06-21Merge branch 'docs/container-scanning-nfs-bug' into 'master'Mike Lewis
Mention Container Scanning NFS bug and how to fix it Closes gitlab-ee#11429 See merge request gitlab-org/gitlab-ce!29908
2019-06-21Mention Container Scanning NFS bug and how to fix itAchilleas Pipinellis
2019-06-21Merge branch 'docs/web-terminals-cleanup' into 'master'Mike Lewis
Clean up the web terminals docs See merge request gitlab-org/gitlab-ce!29929
2019-06-21Merge branch '38105-pre-release-tag' into 'master'Kushal Pandya
Renders pre-release tag for pre-releases See merge request gitlab-org/gitlab-ce!29797
2019-06-21Clean up the web terminals docsAchilleas Pipinellis
- Clarify that they are available only for private Runners - Merge the two sections of file syncing into one
2019-06-21Merge branch 'patch-71' into 'master'Stan Hu
Update rouge See merge request gitlab-org/gitlab-ce!29541
2019-06-21Bump rouge to 3.4.1Zoid
https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md#version-341-2019-06-13
2019-06-21Merge branch ↵Stan Hu
'63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' into 'master' Fix copying a single line from Firefox Closes #63406 See merge request gitlab-org/gitlab-ce!29832
2019-06-21Merge branch 'bw-issue-reorder' into 'master'Kamil Trzciński
Add ability to reorder issues See merge request gitlab-org/gitlab-ce!29012
2019-06-21Merge branch 'dz-group-packages-page-ce' into 'master'Filipa Lacerda
Add packages nav to group sidebar [CE backport] See merge request gitlab-org/gitlab-ce!29592
2019-06-21Merge branch 'pages-domains-auth-ssl-flag' into 'master'Nick Thomas
Don't show private keys for letsencrypt certs See merge request gitlab-org/gitlab-ce!29359
2019-06-21Don't show private keys for letsencrypt certsVladimir Shushlin
Adds enum certificate_source to pages_domains table with default manually_uploaded Mark certificates as 'gitlab_provided' if the were obtained through Let's Encrypt Mark certificates as 'user_provided' if they were uploaded through controller or api Only show private key in domain edit form if it is 'user_provided' Only show LetsEncrypt option if is enabled by application settings (and feature flag) Refactor and fix some specs to match new logic Don't show Let's Encrypt certificates as well
2019-06-21Add reorder action to Project IssuesControllerBrett Walker
to support manual sorting on the frontend
2019-06-21Merge branch 'sanitize_rake_ldap_check_output' into 'master'Lin Jen-Shin
Sanitize LDAP output in Rake tasks Closes #56131 See merge request gitlab-org/gitlab-ce!28427
2019-06-21Sanitize LDAP output in Rake tasksDrew Blessing
The various LDAP check Rake tasks have long supported a SANITIZE environment variable. When present, identifiable information is obscured such as user names and project/group names. Until now, the LDAP check did not honor this. Now it will only say how many users were found. This should at least give the indication that the LDAP configuration found something, but will not leak what it is. Resolves #56131
2019-06-21Uniform html and text emailsFrank van Rest
Uniform new_issue_email html and text emails Uniform note_email html and text emails Uniform new_merge_request_email html and text emails
2019-06-21Merge branch 'docs/add-another-fdw-troubleshoot-item' into 'master'Achilleas Pipinellis
Add new troubleshooting step and refactor Geo replication docs Closes #63210 See merge request gitlab-org/gitlab-ce!29783
2019-06-21Add new troubleshooting step and refactor Geo replication docsEvan Read
2019-06-21Merge branch 'docs/fix-list-desc-templates' into 'master'Achilleas Pipinellis
Fixed formatting of notes bullet list See merge request gitlab-org/gitlab-ce!29923
2019-06-21Fixed formatting of notes bullet listEvan Read
2019-06-21Merge branch 'db/update-geo-nodes-primary' into 'master'Andreas Brandl
Disallow `NULL` values for `geo_nodes.primary` column Closes gitlab-ee#12061 See merge request gitlab-org/gitlab-ce!29818
2019-06-21Merge branch 'paginate-license-management' into 'master'Filipa Lacerda
Backport and Docs for Paginate license management and add license search See merge request gitlab-org/gitlab-ce!27602
2019-06-21Merge branch '59028-fix-extra-plus-in-diffs' into 'master'Phil Hughes
Add back trimChar method to remove trailing +/- Closes #59028 See merge request gitlab-org/gitlab-ce!29518
2019-06-21Add back trimChar method to remove trailing +/-Samantha Ming
Add test for checking output
2019-06-21Renders pre-release tag for pre-releasesFilipa Lacerda
When a release is a pre release, we render an orange badge with `pre-release` label
2019-06-21Merge branch '63507-fix-race-condition-fetching-token' into 'master'Douwe Maan
Resolve "Race condition in fetching Kubernetes token causes missing `$KUBECONFIG`" Closes #63507 See merge request gitlab-org/gitlab-ce!29922
2019-06-21Merge branch 'default-enable-complex-ci-variables-expressions' into 'master'Kamil Trzciński
Enabled complex ci variable expression statements by default See merge request gitlab-org/gitlab-ce!29904
2019-06-21Merge branch 'bug/63162-duplicate_path_in_links' into 'master'Sean McGivern
Do not rewrite relative links for system notes Closes #63162 See merge request gitlab-org/gitlab-ce!29825
2019-06-21Retry fetching Kubernetes Secret tokenDylan Griffith
Since Kubernetes is creating the Secret and token asynchronously it is necessary that we implement some delay or retrying logic to avoid a race condition where we fetch a Secret before the token is even set. There does not appear to be any way for us to force it to be set with any synchronous API call so retrying seems to be the only option.
2019-06-21Merge branch 'remove-kubernetes-service-deployment-platform' into 'master'Thong Kuah
Remove Kubernetes service from deployment platform See merge request gitlab-org/gitlab-ce!29786
2019-06-21Merge branch 'wording-docs' into 'master'Evan Read
Docs: Change wording See merge request gitlab-org/gitlab-ce!29746
2019-06-21Merge branch '62772-disable-kubernetes-credential-passthrough' into 'master'Thong Kuah
Remove fallback to platform credentials for managed project-level clusters Closes #62772 See merge request gitlab-org/gitlab-ce!29262
2019-06-21Remove project-level cluster credential fallbackTiger Watson
Project-level clusters that made use of this legacy behaviour have been migrated to unmanaged clusters, so we are now free to remove this fallback.
2019-06-21Update KubernetesService deprecation warningTiger
2019-06-21Remove Kubernetes service from deployment platformTiger
This will no longer be used for deployments, as all service templates have been migrated to clusters.
2019-06-21Merge branch '62772-migrate-managed-clusters-to-unmanaged' into 'master'Thong Kuah
Migrate managed clusters that aren't using managed features to unmanaged Closes #62772 See merge request gitlab-org/gitlab-ce!29251
2019-06-21Merge branch '63079-migrate-clusters-with-no-token-to-unmanaged' into 'master'Thong Kuah
Migrate clusters with no token to unmanaged Closes #62772 See merge request gitlab-org/gitlab-ce!29648
2019-06-21Merge branch 'sh-omit-issues-links-on-poll' into 'master'Mayra Cabrera
Omit issues links in merge request entity API response Closes #63546 See merge request gitlab-org/gitlab-ce!29917
2019-06-21Merge branch 'patch-28' into 'master'Evan Read
using_docker_images.md: fix config.json path See merge request gitlab-org/gitlab-ce!29791
2019-06-21Omit issues links in merge request entity API responseStan Hu
The merge request widget has a section that includes which issues may be closed or mentioned based on the merge request description. The problem is that rendering and redacting Markdown can be expensive, especially since the browser polls for the data every 10 seconds. Since these links don't change much and are just nice to have, we only load them on first page load. The frontend will use the existing data if the data doesn't appear on subsequent requests. This saves about 30% of the rendering time of this endpoint, which adds up to significant savings considering that `MergeRequestsController#show.json` is called over a million times a day on GitLab.com. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63546
2019-06-21Merge branch 'docs/make-deploy-boards-clearer' into 'master'Evan Read
Make deploy_boards doc clearer about its requirements See merge request gitlab-org/gitlab-ce!29682
2019-06-21Make deploy_boards doc clearer about its requirementsJoão Cunha
2019-06-21Migrate clusters with no token to unmanagedTiger
There are clusters that have Kubernetes namespaces stored which are missing a service account token. These namespaces are unable to be used for deployments, so marking the clusters as unmanaged will allow the platform credentials to be used instead.
2019-06-21Merge branch 'sh-update-component-list-docs' into 'master'Evan Read
Update Grafana and GitLab Monitor in component list See merge request gitlab-org/gitlab-ce!29537
2019-06-21Update Grafana and GitLab Monitor in component listStan Hu
This commit checks off two of the three components in the table that we added for the CEO Challenge in Contribute 2019: * Grafana: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3272 * GitLab Monitor: https://gitlab.com/charts/gitlab/merge_requests/787