summaryrefslogtreecommitdiff
path: root/vendor
Commit message (Collapse)AuthorAgeFilesLines
* Improve the frontend code for the performance barSean McGivern2018-03-131-21/+15
|
* Add Gitaly call details to the performance barSean McGivern2018-03-131-25/+47
| | | | | The same as the SQL queries, show the details of Gitaly calls in the performance bar, as a modal that can be opened in the same way.
* Merge branch '44096-update-zaproxy-image-in-auto-devops-template' into 'master'Dmitriy Zaporozhets2018-03-121-1/+1
|\ | | | | | | | | | | | | Resolve "Update zaproxy image in Auto DevOps template" Closes #44096 See merge request gitlab-org/gitlab-ce!17683
| * Use GitLab fork of zaproxyFabien Catteau2018-03-121-1/+1
| | | | | | | | Closes #44096
* | Merge branch 'update-templates-and-dependencies-10-6' into 'master'Robert Speicher2018-03-087-200/+357
|\ \ | | | | | | | | | | | | Update templates and licenses See merge request gitlab-org/gitlab-ce!17637
| * | Update templates and licensesupdate-templates-and-dependencies-10-6James Lopez2018-03-087-200/+357
| |/
* | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-083-0/+0
|/ | | | This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
* Resolve "Enable privileged mode for Runner installed on Kubernetes"Mayra Cabrera2018-03-061-2/+0
|
* Cleanup after adding MR diff's commit_countJan Provaznik2018-03-053-0/+0
| | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
* Extend Cluster Applications to install GitLab Runner to Kubernetes clusterMayra Cabrera2018-03-011-0/+25
|
* Change RBAC value to false on Prometheus values.yml43261-fix-prometheus-installationMayra Cabrera2018-02-261-0/+3
| | | | | | - This will allow to install Prometheus again without a problem Closes #43621
* Update to jQuery 3.Jacob Schatz2018-02-204-4/+855
|
* Chart.html.haml refactorJacob Schatz2018-02-191-3477/+0
|
* Update vendored AutoDevOps YML for latest SAST changesOlivier Gonzalez2018-02-161-1/+9
|
* Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into ↵Kamil Trzciński2018-02-131-1/+2
|\ | | | | | | | | | | | | | | | | 'master' Fully enable nginx-ingress metrics Closes #43189 See merge request gitlab-org/gitlab-ce!17069
| * 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
| | | | | | | | #39072
| * Merge branch '10-5-update-dependencies-license-list' into 'master'Marin Jankovski2018-02-081-9/+1259
| |\ | | | | | | | | | | | | 10.5 Update the dependencies license list See merge request gitlab-org/gitlab-ce!16998
| | * 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 ↵Kamil Trzciński2018-02-051-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Enable Prometheus metrics for deployed Ingresses Closes #39985 See merge request gitlab-org/gitlab-ce!16866
| | * 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
| | | | | | | | [ci skip]
| * Merge branch '41796-update-auto-deployed-prometheus-scrape-config' into 'master'Kamil Trzciński2018-01-161-119/+81
| |\ | | | | | | | | | | | | | | | | | | Update auto-deployed prometheus scrape config Closes #41796 See merge request gitlab-org/gitlab-ce!16306
| | * Update prometheus.yml to reflect current Omnibus version41796-update-auto-deployed-prometheus-scrape-configJoshua Lambert2018-01-151-119/+81
| | |
| * | Merge branch ↵Kamil Trzciński2018-01-161-13/+17
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | '41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runner' into 'master' Include updated AutoDevOps template with Browser Performance using DinD Closes #41809 See merge request gitlab-org/gitlab-ce!16373
| | * 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
| |\ | | | | | | | | | | | | | | | | | | Fix restoring associations with import/export Closes #41646 See merge request gitlab-org/gitlab-ce!16221
| | * 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 10.4 licenses update Closes #10 See merge request gitlab-org/gitlab-ce!16269
| | * | 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
| | | | | | | | | | | | | | | | | | This commit extracts `kubectl`, `helm` and `codeclimate` versions as CI variables. `kubectl` changes from latest stable version to `1.8.6`, the other two are just extracted in order to be easily updated; now we can also test tool upgrades overriding CI secret variables.
| * Merge branch 'update-autodevops-template' into 'master'Kamil Trzciński2018-01-031-0/+45
| |\ | | | | | | | | | | | | Update Auto DevOps template See merge request gitlab-org/gitlab-ce!16042
| | * 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 list See merge request gitlab-org/gitlab-ce!15905
| * 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
|/