summaryrefslogtreecommitdiff
path: root/vendor
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* Merge branch 'es-module-copy-to-clipboard' into 'master'Tim Zallmann2017-11-301-621/+0
|\ | | | | | | | | Refactor 'copy-to-clipboard.js' See merge request gitlab-org/gitlab-ce!15531
| * 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
|/ | | | | | | | | | | | | | | | The st_commits and st_diffs columns on merge_request_diffs historically held the YAML-serialised data for a merge request diff, in a variety of formats. Since 9.5, these have been migrated in the background to two new tables: merge_request_diff_commits and merge_request_diff_files. That has the advantage that we can actually query the data (for instance, to find out how many commits we've stored), and that it can't be in a variety of formats, but must match the new schema. This is the final step of that journey, where we drop those columns and remove all references to them. This is a breaking change to the importer, because we can no longer import diffs created in the old format, and we cannot guarantee the export will be in the new format unless it was generated after this commit.
* Export text utils as ES6 modulesFilipa Lacerda2017-11-131-11/+0
|