summaryrefslogtreecommitdiff
path: root/vendor
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into ...Kamil Trzciński2018-02-131-1/+2
|\
| * Properly format values.yaml for deployed Ingresses43189-deployed-ingress-configmap-does-not-enable-metricsJoshua Lambert2018-02-121-1/+2
* | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-1210-162/+1305
|\ \ | |/
| * Update jquery.waitforimages & use npm versionnpm-waitforimagesPhil Hughes2018-02-081-144/+0
| * Merge branch '10-5-update-dependencies-license-list' into 'master'Marin Jankovski2018-02-081-9/+1259
| |\
| | * 10.5 Update the dependencies license list10-5-update-dependencies-license-listMark Fletcher2018-02-081-9/+1259
| * | 10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates10-5-update-templatesMark Fletcher2018-02-088-6/+42
| |/
| * Update AutoDevOps template for latest Browser Performance Testing changesJoshua Lambert2018-02-071-3/+4
* | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-0519-26/+353
|\ \ | |/
| * Merge branch '39985-enable-prometheus-metrics-for-deployed-ingresses' into 'm...Kamil Trzciński2018-02-051-0/+8
| |\
| | * Enable Prometheus metrics for deployed IngressesJoshua Lambert2018-02-051-0/+8
| * | Adapt config to support Prometheus 2.1Joshua Lambert2018-02-051-77/+97
| |/
| * Vendor 10.4 Auto DevOps templatevendor-10-4-auto-devops-templatebikebilly2018-01-231-10/+0
| * Update Auto DevOps templateupdate-auto-devops-templateAchilleas Pipinellis2018-01-191-2/+40
| * Merge branch '41796-update-auto-deployed-prometheus-scrape-config' into 'master'Kamil Trzciński2018-01-161-119/+81
| |\
| | * Update prometheus.yml to reflect current Omnibus version41796-update-auto-deployed-prometheus-scrape-configJoshua Lambert2018-01-151-119/+81
| * | Merge branch '41809-auto-devops-performance-docker-image-not-compatible-with-...Kamil Trzciński2018-01-161-13/+17
| |\ \ | | |/ | |/|
| | * Update AutoDevOps template with browser performance fix41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runnerJoshua Lambert2018-01-101-13/+17
| * | Resolve "Managed Prometheus deployment installs a lot of extra stuff"Mayra Cabrera2018-01-151-24/+45
| |/
| * Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'Kamil Trzciński2018-01-073-0/+0
| |\
| | * Bump import/export version in project templatesfix/gb/fix-import-export-restoring-associationsGrzegorz Bizon2018-01-063-0/+0
| * | Merge branch '10-4-licenses-update' into 'master'Marin Jankovski2018-01-071-9/+10
| |\ \
| | * | Update licenses for 10.410-4-licenses-updateLuke Bennett2018-01-061-9/+10
| | |/
| * | Update templates for 10.410-4-templates-updateLuke Bennett2018-01-0613-13/+113
| |/
| * Backport gitlab-org/gitlab-ci-yml!128 - Fix kubectl version to 1.8.6ac-autodevopfix-kubectl-versionAlessio Caiazza2018-01-041-4/+8
| * Merge branch 'update-autodevops-template' into 'master'Kamil Trzciński2018-01-031-0/+45
| |\
| | * Remove SAST:Image for now.Joshua Lambert2017-12-211-25/+0
| | * Update Auto DevOps templateJoshua Lambert2017-12-211-0/+70
| * | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-221-0/+134
| |/
* | Removed the remains of katex from vendor assets and load everything via webpackJose Ivan Vargas2017-12-2181-1189/+0
* | added katex.js and load it via webpackJose Ivan Vargas2017-12-211-14407/+0
* | Updated katex libraryJose Ivan Vargas2017-12-2182-4778/+10712
|/
* Avoid running autodevops sast job on GitLab CEskip-sast-on-ceAlessio Caiazza2017-12-151-1/+12
* Merge branch 'update-dependencies-license-list' into 'master'LUKE BENNETT2017-12-131-1070/+27
|\
| * Updates dependencies license listupdate-dependencies-license-listTiago Botelho2017-12-131-1070/+27
* | Ran bin/rake gitlab:update_templates10-3-gitignoreLuke Bennett2017-12-1318-63/+150
|/
* Merge branch 'es-module-copy-to-clipboard' into 'master'Tim Zallmann2017-11-301-621/+0
|\
| * remove vendored clipboard library in favor of package.json entryMike Greiling2017-11-281-621/+0
* | Remove serialised diff and commit columnsSean McGivern2017-11-283-0/+0
|/
* Export text utils as ES6 modulesFilipa Lacerda2017-11-131-11/+0
* Merge branch 'winh-update-licenses-10-2' into 'master'Oswaldo Ferreira2017-11-101-23/+205
|\
| * Update licenses for 10.2winh-update-licenses-10-2Winnie Hellmann2017-11-101-23/+205
* | Update templates for 10.2winh-templates-10-2Winnie Hellmann2017-11-103-3/+3
|/
* Upgrade vendored templatesAlessio Caiazza2017-11-078-20/+107
* Remove Peek's original keyboard shortcut (numpad 0, keycode 96)rc/remove-peek-keyboard-shortcutRémy Coutable2017-11-031-18/+10
* Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"Tim Zallmann2017-11-011-1161/+0
* Resolve "Convert autosize.js library to be a Yarn managed library"Tim Zallmann2017-10-311-243/+0
* Merge branch 'update-licenses.csv' into 'master'Rémy Coutable2017-10-121-102/+52
|\
| * Update licensesLin Jen-Shin2017-10-121-102/+52
* | Update templates via:Lin Jen-Shin2017-10-1219-21/+85
|/