Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '46286-fix-ingress-rbac-default-value' into 'master' | Kamil Trzciński | 2018-05-15 | 1 | -0/+5 |
| | | | | | | | Disable RBAC on Ingress by default Closes #46286 See merge request gitlab-org/gitlab-ce!18947 | ||||
* | Merge branch 'vendor-auto-devops-template' into 'master' | Kamil Trzciński | 2018-05-11 | 1 | -36/+18 |
| | | | | | Vendor Auto DevOps template See merge request gitlab-org/gitlab-ce!18876 | ||||
* | Merge branch '10-8-update-gitignore' into 'master' | James Lopez | 2018-05-09 | 12 | -15/+27 |
| | | | | | Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates See merge request gitlab-org/gitlab-ce!18845 | ||||
* | Merge branch '10-8-dependencies-update' into 'master' | James Lopez | 2018-05-09 | 1 | -162/+234 |
| | | | | | Update the dependencies license list See merge request gitlab-org/gitlab-ce!18847 | ||||
* | Vendor Auto-DevOps.gitlab-ci.yml | Fabio Busatto | 2018-05-08 | 1 | -23/+166 |
| | |||||
* | Resolve "Reconcile project templates with Auto DevOps" | Fabio Busatto | 2018-05-04 | 3 | -0/+0 |
| | |||||
* | remove peek performance_bar | Pirate Praveen | 2018-04-26 | 1 | -182/+0 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Cleanup after adding MR diff's commit_count (try 2) | Jan Provaznik | 2018-04-25 | 3 | -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 | ||||
* | Avoid infinite loop in container scanning job. Refs gitlab-org/gitlab-ee#5706 | Olivier Gonzalez | 2018-04-18 | 1 | -1/+3 |
| | |||||
* | Fix container scanning in vendored GitLab CI configuration for Auto Devops | Gilbert Roulot | 2018-04-16 | 1 | -0/+1 |
| | |||||
* | Use stable docker image instead of latest | Philippe Lafoucrière | 2018-04-13 | 2 | -2/+2 |
| | |||||
* | Update the dependencies license list for 10.7 | Filipa Lacerda | 2018-04-12 | 1 | -64/+65 |
| | |||||
* | Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates | Filipa Lacerda | 2018-04-12 | 19 | -17/+81 |
| | |||||
* | Update vendored .gitlab-ci.yml for Auto-Devops | Olivier Gonzalez | 2018-04-10 | 1 | -11/+42 |
| | |||||
* | Override the Prometheus server name | Joshua Lambert | 2018-04-05 | 1 | -0/+1 |
| | |||||
* | Show Ajax requests in performance bar | Sean McGivern | 2018-03-19 | 1 | -86/+0 |
| | | | | | | | | | | | | | | | | | But first, rewrite the performance bar in Vue: 1. Remove the peek-host gem and replace it with existing code. This also allows us to include the host in the JSON response, rather than in the page HTML. 2. Leave the line profiler parts as here-be-dragons: nicer would be a separate endpoint for these, so we could use them on Ajax requests too. 3. The performance bar is too fiddly to rewrite right now, so apply the same logic to that. Then, add features! All requests made through Axios are able to be tracked. To keep a lid on memory usage, only the first two requests for a given URL are tracked, though. Each request that's tracked has the same data as the initial page load, with the exception of the performance bar and the line profiler, as explained above. | ||||
* | Update vendored gitlab-ci.yml template for auto-devops | Olivier Gonzalez | 2018-03-16 | 1 | -6/+5 |
| | |||||
* | Improve the frontend code for the performance bar | Sean McGivern | 2018-03-13 | 1 | -21/+15 |
| | |||||
* | Add Gitaly call details to the performance bar | Sean McGivern | 2018-03-13 | 1 | -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 Zaporozhets | 2018-03-12 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Resolve "Update zaproxy image in Auto DevOps template" Closes #44096 See merge request gitlab-org/gitlab-ce!17683 | ||||
| * | Use GitLab fork of zaproxy | Fabien Catteau | 2018-03-12 | 1 | -1/+1 |
| | | | | | | | | Closes #44096 | ||||
* | | Merge branch 'update-templates-and-dependencies-10-6' into 'master' | Robert Speicher | 2018-03-08 | 7 | -200/+357 |
|\ \ | | | | | | | | | | | | | Update templates and licenses See merge request gitlab-org/gitlab-ce!17637 | ||||
| * | | Update templates and licensesupdate-templates-and-dependencies-10-6 | James Lopez | 2018-03-08 | 7 | -200/+357 |
| |/ | |||||
* | | Revert "Cleanup after adding MR diff's commit_count" | Jan Provaznik | 2018-03-08 | 3 | -0/+0 |
|/ | | | | This reverts commit 0b7d10851456018328da137beeca931767b4fd0a. | ||||
* | Resolve "Enable privileged mode for Runner installed on Kubernetes" | Mayra Cabrera | 2018-03-06 | 1 | -2/+0 |
| | |||||
* | Cleanup after adding MR diff's commit_count | Jan Provaznik | 2018-03-05 | 3 | -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 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 |
| |/ |