Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Extend Cluster Applications to install GitLab Runner to Kubernetes cluster | Mayra Cabrera | 2018-03-01 | 1 | -0/+25 |
| | |||||
* | Change RBAC value to false on Prometheus values.yml43261-fix-prometheus-installation | Mayra Cabrera | 2018-02-26 | 1 | -0/+3 |
| | | | | | | - This will allow to install Prometheus again without a problem Closes #43621 | ||||
* | Update to jQuery 3. | Jacob Schatz | 2018-02-20 | 4 | -4/+855 |
| | |||||
* | Chart.html.haml refactor | Jacob Schatz | 2018-02-19 | 1 | -3477/+0 |
| | |||||
* | Update vendored AutoDevOps YML for latest SAST changes | Olivier Gonzalez | 2018-02-16 | 1 | -1/+9 |
| | |||||
* | Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into ↵ | Kamil Trzciński | 2018-02-13 | 1 | -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-metrics | Joshua Lambert | 2018-02-12 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into jivl-update-katex | Jose Ivan Vargas | 2018-02-12 | 10 | -162/+1305 |
|\ \ | |/ | |||||
| * | Update jquery.waitforimages & use npm versionnpm-waitforimages | Phil Hughes | 2018-02-08 | 1 | -144/+0 |
| | | | | | | | | #39072 | ||||
| * | Merge branch '10-5-update-dependencies-license-list' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -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-list | Mark Fletcher | 2018-02-08 | 1 | -9/+1259 |
| | | | |||||
| * | | 10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates10-5-update-templates | Mark Fletcher | 2018-02-08 | 8 | -6/+42 |
| |/ | |||||
| * | Update AutoDevOps template for latest Browser Performance Testing changes | Joshua Lambert | 2018-02-07 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'master' into jivl-update-katex | Jose Ivan Vargas | 2018-02-05 | 19 | -26/+353 |
|\ \ | |/ | |||||
| * | Merge branch '39985-enable-prometheus-metrics-for-deployed-ingresses' into ↵ | Kamil Trzciński | 2018-02-05 | 1 | -0/+8 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Enable Prometheus metrics for deployed Ingresses Closes #39985 See merge request gitlab-org/gitlab-ce!16866 | ||||
| | * | Enable Prometheus metrics for deployed Ingresses | Joshua Lambert | 2018-02-05 | 1 | -0/+8 |
| | | | |||||
| * | | Adapt config to support Prometheus 2.1 | Joshua Lambert | 2018-02-05 | 1 | -77/+97 |
| |/ | |||||
| * | Vendor 10.4 Auto DevOps templatevendor-10-4-auto-devops-template | bikebilly | 2018-01-23 | 1 | -10/+0 |
| | | |||||
| * | Update Auto DevOps templateupdate-auto-devops-template | Achilleas Pipinellis | 2018-01-19 | 1 | -2/+40 |
| | | | | | | | | [ci skip] | ||||
| * | Merge branch '41796-update-auto-deployed-prometheus-scrape-config' into 'master' | Kamil Trzciński | 2018-01-16 | 1 | -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-config | Joshua Lambert | 2018-01-15 | 1 | -119/+81 |
| | | | |||||
| * | | Merge branch ↵ | Kamil Trzciński | 2018-01-16 | 1 | -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-runner | Joshua Lambert | 2018-01-10 | 1 | -13/+17 |
| | | | |||||
| * | | Resolve "Managed Prometheus deployment installs a lot of extra stuff" | Mayra Cabrera | 2018-01-15 | 1 | -24/+45 |
| |/ | |||||
| * | Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master' | Kamil Trzciński | 2018-01-07 | 3 | -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-associations | Grzegorz Bizon | 2018-01-06 | 3 | -0/+0 |
| | | | |||||
| * | | Merge branch '10-4-licenses-update' into 'master' | Marin Jankovski | 2018-01-07 | 1 | -9/+10 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 10.4 licenses update Closes #10 See merge request gitlab-org/gitlab-ce!16269 | ||||
| | * | | Update licenses for 10.410-4-licenses-update | Luke Bennett | 2018-01-06 | 1 | -9/+10 |
| | |/ | |||||
| * | | Update templates for 10.410-4-templates-update | Luke Bennett | 2018-01-06 | 13 | -13/+113 |
| |/ | |||||
| * | Backport gitlab-org/gitlab-ci-yml!128 - Fix kubectl version to 1.8.6ac-autodevopfix-kubectl-version | Alessio Caiazza | 2018-01-04 | 1 | -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ński | 2018-01-03 | 1 | -0/+45 |
| |\ | | | | | | | | | | | | | Update Auto DevOps template See merge request gitlab-org/gitlab-ce!16042 | ||||
| | * | Remove SAST:Image for now. | Joshua Lambert | 2017-12-21 | 1 | -25/+0 |
| | | | |||||
| | * | Update Auto DevOps template | Joshua Lambert | 2017-12-21 | 1 | -0/+70 |
| | | | |||||
| * | | Extend Cluster Applications to allow installation of Prometheus | Mayra Cabrera | 2017-12-22 | 1 | -0/+134 |
| |/ | |||||
* | | Removed the remains of katex from vendor assets and load everything via webpack | Jose Ivan Vargas | 2017-12-21 | 81 | -1189/+0 |
| | | |||||
* | | added katex.js and load it via webpack | Jose Ivan Vargas | 2017-12-21 | 1 | -14407/+0 |
| | | |||||
* | | Updated katex library | Jose Ivan Vargas | 2017-12-21 | 82 | -4778/+10712 |
|/ | |||||
* | Avoid running autodevops sast job on GitLab CEskip-sast-on-ce | Alessio Caiazza | 2017-12-15 | 1 | -1/+12 |
| | |||||
* | Merge branch 'update-dependencies-license-list' into 'master' | LUKE BENNETT | 2017-12-13 | 1 | -1070/+27 |
|\ | | | | | | | | | Updates dependencies license list See merge request gitlab-org/gitlab-ce!15905 | ||||
| * | Updates dependencies license listupdate-dependencies-license-list | Tiago Botelho | 2017-12-13 | 1 | -1070/+27 |
| | | |||||
* | | Ran bin/rake gitlab:update_templates10-3-gitignore | Luke Bennett | 2017-12-13 | 18 | -63/+150 |
|/ | |||||
* | Merge branch 'es-module-copy-to-clipboard' into 'master' | Tim Zallmann | 2017-11-30 | 1 | -621/+0 |
|\ | | | | | | | | | Refactor 'copy-to-clipboard.js' See merge request gitlab-org/gitlab-ce!15531 | ||||
| * | remove vendored clipboard library in favor of package.json entry | Mike Greiling | 2017-11-28 | 1 | -621/+0 |
| | | |||||
* | | Remove serialised diff and commit columns | Sean McGivern | 2017-11-28 | 3 | -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 modules | Filipa Lacerda | 2017-11-13 | 1 | -11/+0 |
| | |||||
* | Merge branch 'winh-update-licenses-10-2' into 'master' | Oswaldo Ferreira | 2017-11-10 | 1 | -23/+205 |
|\ | | | | | | | | | Update licenses for 10.2 See merge request gitlab-org/gitlab-ce!15318 | ||||
| * | Update licenses for 10.2winh-update-licenses-10-2 | Winnie Hellmann | 2017-11-10 | 1 | -23/+205 |
| | | |||||
* | | Update templates for 10.2winh-templates-10-2 | Winnie Hellmann | 2017-11-10 | 3 | -3/+3 |
|/ | |||||
* | Upgrade vendored templates | Alessio Caiazza | 2017-11-07 | 8 | -20/+107 |
| | |||||
* | Remove Peek's original keyboard shortcut (numpad 0, keycode 96)rc/remove-peek-keyboard-shortcut | Rémy Coutable | 2017-11-03 | 1 | -18/+10 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> |