summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix merge master conflicts7250-group-bulk-edit-issues-mrs-epics-change-label-ceEugenia Grieff2019-08-07411-1251/+2584
|\
| * Merge branch 'andr3-remove-iamphill-sadly' into 'master'Tim Zallmann2019-08-071-2/+2
| |\
| | * Remove iamphill from FE Maintainers in codeownersandr3-remove-iamphill-sadlyAndré Luís2019-08-051-2/+2
| * | Merge branch 'sh-disable-registry-delete' into 'master'Thong Kuah2019-08-073-0/+18
| |\ \
| | * | Don't attempt to contact registry if it is disabledsh-disable-registry-deleteStan Hu2019-08-063-0/+18
| * | | Merge branch 'docs/compress-images' into 'master'Rémy Coutable2019-08-07232-0/+0
| |\ \ \
| | * | | Compress images with pngquantAchilleas Pipinellis2019-08-07232-0/+0
| |/ / /
| * | | Merge branch 'mc/feature/add-at-colon-variable-masking' into 'master'Grzegorz Bizon2019-08-075-5/+11
| |\ \ \
| | * | | Document new masking requirementsmc/feature/add-at-colon-variable-maskingMatija Čupić2019-07-232-2/+3
| | * | | Add CHANGELOG entryMatija Čupić2019-07-231-0/+5
| | * | | Allow masking @ and : charactersMatija Čupić2019-07-233-3/+3
| * | | | Merge branch 'if-64985-redis_pipelined_in_active_session' into 'master'Thong Kuah2019-08-071-2/+4
| |\ \ \ \
| | * | | | ActiveSession.cleaned_up_lookup_entries to use Redis#pipelinedImre Farkas2019-08-071-2/+4
| |/ / / /
| * | | | Merge branch 'docs/65499-amend-add-rate-limit-docs' into 'master'Evan Read2019-08-073-18/+21
| |\ \ \ \
| | * | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65499Russell Dickenson2019-08-073-18/+21
| |/ / / /
| * | | | Merge branch 'docs/62446-fix-email-nav-path' into 'master'Evan Read2019-08-072-6/+5
| |\ \ \ \
| | * | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446Russell Dickenson2019-08-072-6/+5
| |/ / / /
| * | | | Merge branch 'docs/4501-docker-in-docker-19-03-service-fails' into 'master'Evan Read2019-08-071-54/+150
| |\ \ \ \
| | * | | | Update DinD example for 19.03docs/4501-docker-in-docker-19-03-service-failsSteve Azzopardi2019-08-061-54/+150
| * | | | | Merge branch '33401-follow-up-from-add-prometheus-metrics-endpoint-and-basic-...Sean McGivern2019-08-071-1/+8
| |\ \ \ \ \
| | * | | | | Clean tmpdirs in metrics endpoint specsPeter Leitzen2019-08-071-1/+8
| |/ / / / /
| * | | | | Merge branch 'docs-fix-assorted-links' into 'master'Evan Read2019-08-0712-18/+15
| |\ \ \ \ \
| | * | | | | Fix assorted linksMarcel Amirault2019-08-0712-18/+15
| |/ / / / /
| * | | | | Merge branch 'sh-support-csp-nonce' into 'master'Ash McKenzie2019-08-0717-58/+210
| |\ \ \ \ \
| | * | | | | Add support for Content-Security-PolicyStan Hu2019-08-0717-58/+210
| * | | | | | Merge branch '52494-separate-namespace-per-project-environment-slug' into 'ma...Thong Kuah2019-08-0742-542/+968
| |\ \ \ \ \ \
| | * | | | | | Use separate Kubernetes namespaces per environmentTiger Watson2019-08-0742-542/+968
| |/ / / / / /
| * | | | | | Merge branch 'docs-labels-follow-up' into 'master'Evan Read2019-08-071-2/+4
| |\ \ \ \ \ \
| | * | | | | | Follow-up: Tweak line to improve badge placementMarcel Amirault2019-08-071-2/+4
| |/ / / / / /
| * | | | | | Merge branch 'docs-followup-git-tricks' into 'master'Evan Read2019-08-071-3/+3
| |\ \ \ \ \ \
| | * | | | | | Follow-Up: Change code blocks to shell typeMarcel Amirault2019-08-071-3/+3
| |/ / / / / /
| * | | | | | Merge branch '60024-remove-restclient-from-prom-client' into 'master'Ash McKenzie2019-08-0717-79/+112
| |\ \ \ \ \ \
| | * | | | | | Convert RestClient to Gitlab::HTTP for Prometheus MonitorDavid Wilkins2019-08-0717-79/+112
| |/ / / / / /
| * | | | | | Merge branch 'docs-update-LE-url' into 'master'Evan Read2019-08-071-1/+1
| |\ \ \ \ \ \
| | * | | | | | Docs - Update link in SSL_TLS Certificates Page to Let's Encrypt IntergrationDean Leggo2019-08-071-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'mc/bug/nil-take' into 'master'remove-duplicate-issue-boards-from-project-export-page-ceStan Hu2019-08-062-19/+25
| |\ \ \ \ \ \
| | * | | | | | Fix nil take regressionmc/bug/nil-takeMatija Čupić2019-08-072-19/+25
| |/ / / / / /
| * | | | | | Merge branch 'qa-lower-default-cluster-size' into 'master'Dan Davison2019-08-061-1/+1
| |\ \ \ \ \ \
| | * | | | | | Default number of GCP nodes to 1Dan Davison2019-08-061-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'remove-peek-gc' into 'master'Stan Hu2019-08-066-16/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Remove GC metrics from performance barSean McGivern2019-08-066-16/+5
| * | | | | | Merge branch 'jramsay/committer-approval-api' into 'master'Douwe Maan2019-08-061-8/+10
| |\ \ \ \ \ \
| | * | | | | | Add committer approval API attributejramsay/committer-approval-apiJames Ramsay2019-08-061-8/+10
| * | | | | | | Merge branch 'update-packer-ci-template' into 'master'Douglas Barbosa Alexandre2019-08-062-1/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Update Packer.gitlab-ci.yml to use latest imageKelly Hair2019-08-062-1/+6
| * | | | | | | | Merge branch '64608-double-tooltips' into 'master'Annabel Dunstone Gray2019-08-063-13/+16
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Prevents showing 2 tooltips in pipelines64608-double-tooltipsFilipa Lacerda2019-08-063-13/+16
| * | | | | | | | Merge branch '65671-update-mini_magick-to-4.9.5' into 'master'Douwe Maan2019-08-062-1/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update mini_magick to 4.9.5Takuya Noguchi2019-08-062-1/+6
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'sh-update-nfs-delegation-docs' into 'master'Drew Blessing2019-08-061-0/+5
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |