summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [CE port] Bypass push rules for merge to ref serviceosw-bypass-push-rules-for-merge-to-refOswaldo Ferreira2019-07-095-17/+42
* Merge branch '63362-follow-up-from-visual-review-toolbar-docs' into 'master'Achilleas Pipinellis2019-07-082-34/+92
|\
| * Refactor the Visual Reviews docsAchilleas Pipinellis2019-07-082-34/+92
|/
* Merge branch 'run-pipeline-for-merge-train-at-train-ref-ce' into 'master'Kamil Trzciński2019-07-084-0/+56
|\
| * Fix race condition on merge train ref generationrun-pipeline-for-merge-train-at-train-ref-ceShinya Maeda2019-07-084-0/+56
* | Merge branch 'jc-detect-nfs-for-rugged' into 'master'Dmitriy Zaporozhets2019-07-0810-7/+171
|\ \
| * | Use Rugged if we detect storage is NFS and we can access the diskjc-detect-nfs-for-ruggedJohn Cai2019-07-0510-7/+171
* | | Merge branch '63475-fix-n-1' into 'master'Lin Jen-Shin2019-07-0812-254/+268
|\ \ \
| * | | Add retry:0 for controller specs n+163475-fix-n-1Thong Kuah2019-07-081-1/+1
| * | | BE feedback: memoize deployment_metricsThong Kuah2019-07-081-1/+7
| * | | Restore fallback to deployment_platform_clusterThong Kuah2019-07-083-4/+28
| * | | Remove un-used methodThong Kuah2019-07-082-33/+0
| * | | Could not address last 5 queriesThong Kuah2019-07-081-1/+4
| * | | Extract deployment_metrics into own objectThong Kuah2019-07-088-196/+205
| * | | Share project object in EnvironmentStatusThong Kuah2019-07-083-8/+13
| * | | Remove fallback to project.deployment_platformThong Kuah2019-07-083-18/+6
| * | | Add failing test showing N+1Thong Kuah2019-07-081-0/+12
* | | | Merge branch 'sh-bump-prometheus-client-mmap-0.9.7' into 'master'Kamil Trzciński2019-07-082-3/+3
|\ \ \ \
| * | | | Upgrade prometheus-client-mmap to 0.9.7sh-bump-prometheus-client-mmap-0.9.7Stan Hu2019-07-052-3/+3
* | | | | Merge branch 'zj-praefect-config-gitlab-yml' into 'master'Bob Van Landuyt2019-07-081-9/+0
|\ \ \ \ \
| * | | | | Remove high cardinality Prometheus metriczj-praefect-config-gitlab-ymlZeger-Jan van de Weg2019-07-051-9/+0
* | | | | | Merge branch 'docs/enforce-headers-increment-one-level' into 'master'Achilleas Pipinellis2019-07-0813-50/+50
|\ \ \ \ \ \
| * | | | | | Add lint rule that headings must increment one level at a timeEvan Read2019-07-0813-50/+50
|/ / / / / /
* | | | | | Merge branch '12632-fix-multiple-discussions' into 'master'Phil Hughes2019-07-085-0/+23
|\ \ \ \ \ \
| * | | | | | Backported EE fix to CENatalia Tepluhina2019-07-085-0/+23
|/ / / / / /
* | | | | | Merge branch '40379-CJK-search-min-chars' into 'master'Andreas Brandl2019-07-086-13/+44
|\ \ \ \ \ \
| * | | | | | Ignore min_chars_for_partial_matching unles trigrm40379-CJK-search-min-charsMario de la Ossa2019-07-046-13/+44
* | | | | | | Merge branch 'docs-brackets-to-parens' into 'master'Achilleas Pipinellis2019-07-08216-647/+647
|\ \ \ \ \ \ \
| * | | | | | | Changing badges to use parentheses not bracketsMarcel Amirault2019-07-08216-647/+647
|/ / / / / / /
* | | | | | | Merge branch '60213-fix-is-ee-webpack-checks' into 'master'Filipa Lacerda2019-07-0813-41/+25
|\ \ \ \ \ \ \
| * | | | | | | Replace runtime isEE check with compile time one60213-fix-is-ee-webpack-checksLukas Eipert2019-07-0513-41/+25
* | | | | | | | Merge branch 'vue-i18n-js-vue-shared-directory' into 'master'Phil Hughes2019-07-0821-56/+138
|\ \ \ \ \ \ \ \
| * | | | | | | | Vue-i18n: app/assets/javascripts/vue_shared directoryEzekiel Kigbo2019-07-0821-56/+138
|/ / / / / / / /
* | | | | | | | Merge branch 'vue-i18n-js-vue-mr-widget-directory' into 'master'Fatih Acet2019-07-089-46/+117
|\ \ \ \ \ \ \ \
| * | | | | | | | Vue-i18n: app/assets/javascripts/vue_merge_request_widget directoryEzekiel Kigbo2019-07-089-46/+117
|/ / / / / / / /
* | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Fatih Acet2019-07-082-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Update dependency @gitlab/svgs to ^1.67.0Lukas Eipert2019-07-052-5/+5
* | | | | | | | | Merge branch '12533-shared-runners-warning' into 'master'Phil Hughes2019-07-082-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removes EE differences12533-shared-runners-warningFilipa Lacerda2019-07-052-1/+6
* | | | | | | | | | Merge branch '60856-deleting-binary-file' into 'master'winh-does-jest-failKushal Pandya2019-07-088-17/+88
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Initiate editor for any file without content60856-deleting-binary-fileDenys Mishunov2019-07-055-14/+81
| * | | | | | | | | | Mark images as binary on initDenys Mishunov2019-07-053-3/+7
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'clusters-group-cte' into 'master'James Lopez2019-07-085-3/+216
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Create CTE query for clusters hierarchyThong Kuah2019-07-085-3/+216
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'patch-71' into 'master'Evan Read2019-07-081-3/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Description of the optimized path wildcardBlack-Hole2019-07-081-3/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-update-jira-integration' into 'master'Evan Read2019-07-089-20/+22
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Refresh screenshotsTristan Williams2019-07-089-20/+22
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-71' into 'master'Evan Read2019-07-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ADD '.git' ending to git clone with CI_JOB_TOKEN for clarityglass-ships2019-07-081-1/+1
|/ / / / / / / / /