summaryrefslogtreecommitdiff
path: root/vendor
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* 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
|
* Merge branch 'winh-update-licenses-10-2' into 'master'Oswaldo Ferreira2017-11-101-23/+205
|\ | | | | | | | | Update licenses for 10.2 See merge request gitlab-org/gitlab-ce!15318
| * 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
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* 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 dependencies license list See merge request gitlab-org/gitlab-ce!14845
| * Update licensesLin Jen-Shin2017-10-121-102/+52
| | | | | | | | | | | | | | | | Followed the command from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#step-4-update-the-dependencies-license-list bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv
* | Update templates via:Lin Jen-Shin2017-10-1219-21/+85
|/ | | | bin/rake gitlab:update_templates
* Support new auto-deploy helm chartfix-autodevops-monitoringAlessio Caiazza2017-09-201-4/+0
| | | | | | | New auto-deploy helm chart has new names in order to support Auto Monitoring. Works with, but does not require charts/charts.gitlab.io!66 See gitlab-ce#38028
* Merge branch 'jk-update-dependencies' into 'master'Achilleas Pipinellis2017-09-081-293/+326
|\ | | | | | | | | Update dependencies license list for 10.0 See merge request !14137
| * Update dependencies license list for 10.0jk-update-dependenciesJarka Kadlecova2017-09-081-293/+326
| |
* | Update license templates for 10.0jk-update-templatesJarka Kadlecova2017-09-084-4/+55
|/
* Update rails template to include postgreszj-update-rails-templateZeger-Jan van de Weg2017-09-071-0/+0
|
* Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-073-0/+0
|\ | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932
| * Update project templates to new import versionZeger-Jan van de Weg2017-09-073-0/+0
| | | | | | | | | | | | | | If the import version changes, we need to update a few project templates to match this new version. In a seperate commit I'll update the docs to reflect this.
* | Update templates for 10.0update-templates-for-10-0Alessio Caiazza2017-09-0714-22/+572
|/
* Merge branch 'update-gitignore-9-5' into 'master'Rémy Coutable2017-09-0511-48/+58
|\ | | | | | | | | update gitignores and licenses See merge request !13423
| * update gitignores and licenses - generated by bin/rake gitlab:update_templatesupdate-gitignore-9-5Simon Knox2017-08-0911-48/+58
| |
* | Merge branch 'zj-update-templates-with-warning-header' into 'master'Stan Hu2017-08-283-0/+0
|\ \ | | | | | | | | | | | | | | | | | | Update templates to include header in the README Closes #36904 See merge request !13785
| * | Update templates to include header in the READMEZeger-Jan van de Weg2017-08-233-0/+0
| | |
* | | Changed all font-weight values to 400 and 600Dimitrie Hoekstra2017-08-242-18/+18
|/ /
* | Add two more project templateszj-add-two-more-project-templatesZ.J. van de Weg2017-08-152-0/+0
| | | | | | | | | | | | | | Related to !13108. Mostly this is just running the rake task and changing the task a bit to catch cases like the project already existing or so. The rake task moves archives to the vendor/project_template directory, which are checked in too.
* | Update rails tempalte to not contain gitlab-testZeger-Jan van de Weg2017-08-141-0/+0
|/ | | | [ci skip]