summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix doc links for adding a cluster to a projectdz-fix-add-cluster-doc-linksdocs/dz-fix-cluster-doc-linksDmitriy Zaporozhets2019-09-102-2/+2
* Merge branch 'patch-76' into 'master'Ray Paik2019-09-091-1/+1
|\
| * fix typo in backup_restore.mdDan Hahne2019-09-061-1/+1
* | Merge branch 'dind-example-doc' into 'master'Evan Read2019-09-091-0/+7
|\ \
| * | Add DinD example note for k8s executorsKyle Russell2019-09-091-0/+7
|/ /
* | Merge branch 'docs/sast-ds-docker-version' into 'master'Evan Read2019-09-092-18/+20
|\ \
| * | Document workaround for SAST failuresAchilleas Pipinellis2019-09-092-18/+20
|/ /
* | Merge branch 'docs-realign-danger-doc' into 'master'Evan Read2019-09-091-1/+1
|\ \
| * | Bring typo fix from EE into CEMarcel Amirault2019-09-091-1/+1
|/ /
* | Merge branch 'reduce-parse-options-complexity' into 'master'Ash McKenzie2019-09-091-8/+12
|\ \
| * | Refactor parse_options() in push_options.rbreduce-parse-options-complexityChristian Couder2019-09-071-8/+12
* | | Merge branch '51123-error-500-viewing-admin-page-due-to-statement-timeout-on-...Ash McKenzie2019-09-0928-39/+732
|\ \ \
| * | | Application Statistics APIManoj MJ2019-09-0928-39/+732
|/ / /
* | | Merge branch 'docs-chmod-imgs' into 'master'Evan Read2019-09-093-0/+0
|\ \ \
| * | | Chmod 644 on 3 imagesMarcel Amirault2019-09-093-0/+0
|/ / /
* | | Merge branch 'docs-group-level-jupyterhub' into 'master'Evan Read2019-09-091-3/+5
|\ \ \
| * | | Document JupyterHub is available for group-level clustersdocs-group-level-jupyterhubJames Fargher2019-09-061-3/+5
* | | | Merge branch 'docs/standardise_punctuation' into 'master'Evan Read2019-09-091-4/+4
|\ \ \ \
| * | | | Standardised punctuation at end of sentencesRussell Dickenson2019-09-091-4/+4
|/ / / /
* | | | Merge branch 'docs-api-divergence' into 'master'Evan Read2019-09-092-3/+3
|\ \ \ \
| * | | | Bring typo fix over from EEMarcel Amirault2019-09-092-3/+3
|/ / / /
* | | | Merge branch 'docs/remove-unwanted-spaces-plantuml' into 'master'Evan Read2019-09-091-2/+2
|\ \ \ \
| * | | | Fix issue causing linting test failuresRussell Dickenson2019-09-091-2/+2
|/ / / /
* | | | Merge branch 'docs-add-auto-sign-in-omniauth-blunceford' into 'master'Evan Read2019-09-081-0/+30
|\ \ \ \
| * | | | Add auto_sign_in_with_provider info to OmniAuth docBlair Lunceford2019-09-081-0/+30
|/ / / /
* | | | Merge branch 'patch-71' into 'master'Evan Read2019-09-081-1/+16
|\ \ \ \
| * | | | fix for #60120Daniel Le Berre2019-09-081-1/+16
|/ / / /
* | | | Merge branch 'docs-qa-readme-ref' into 'master'Dan Davison2019-09-081-3/+1
|\ \ \ \
| * | | | Replace GDK refDan Davison2019-09-081-3/+1
|/ / / /
* | | | Merge branch 'bump-fog-google' into 'master'Stan Hu2019-09-082-3/+3
|\ \ \ \
| * | | | Bump fog-google to support ADC auth on GCPMaxim Ivanov2019-09-062-3/+3
* | | | | Merge branch 'remove-unnecessary-freeze-in-app-helpers' into 'master'Stan Hu2019-09-081-3/+3
|\ \ \ \ \
| * | | | | Avoid calling freeze on already frozen strings in app/helpersdineshpanda2019-09-041-3/+3
* | | | | | Merge branch 'kamil-refactor-import-structure' into 'master'Stan Hu2019-09-0814-587/+580
|\ \ \ \ \ \
| * | | | | | Normalize import_export structurekamil-refactor-import-structureKamil Trzciński2019-09-0614-587/+580
* | | | | | | Merge branch 'patch-73' into 'master'Marcia Ramos2019-09-071-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Updated description in the Gitlab Prometheus metrics sectionEtienne Baqué2019-09-071-3/+3
|/ / / / / / /
* | | | | | | Merge branch '63044-add-prom-proxies-ce' into 'master'Kamil Trzciński2019-09-072-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Add method to authorize reading from prometheus proxyRyan Cobb2019-09-072-0/+5
|/ / / / / / /
* | | | | | | Merge branch 'ecdsa_pages_certificates' into 'master'Michael Kozono2019-09-077-4/+198
|\ \ \ \ \ \ \
| * | | | | | | Allow to load ECDSA certificates for pages domainsVladimir Shushlin2019-09-077-4/+198
|/ / / / / / /
* | | | | | | Merge branch 'weimeng-fix-burndown-x-offset' into 'master'Mike Greiling2019-09-062-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Add timezone-mock packageweimeng-fix-burndown-x-offsetWei-Meng Lee2019-09-062-0/+6
* | | | | | | | Merge branch 'keyboard-shortcuts-2' into 'master'Paul Slaughter2019-09-0610-353/+348
|\ \ \ \ \ \ \ \
| * | | | | | | | Update keyboard shortcuts modal and docMarcel Amirault2019-09-0610-353/+348
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-fix-captcha-state-pollution-spec' into 'master'Mayra Cabrera2019-09-061-7/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix order-dependent spec failures with reCAPTCHAsh-fix-captcha-state-pollution-specStan Hu2019-09-061-7/+1
* | | | | | | | Merge branch 'update-rouge' into 'master'Stan Hu2019-09-063-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Update rouge to v3.10.0Camil Staps2019-09-063-3/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'docs-update-mr-documentation-template' into 'master'Achilleas Pipinellis2019-09-061-0/+1
|\ \ \ \ \ \ \ \