Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump Gitlab Shell to v6.0.4gitlab-shell-6-0-4 | Alejandro Rodríguez | 2018-03-06 | 1 | -1/+1 |
| | |||||
* | Merge branch ↵ | Kamil Trzciński | 2018-03-06 | 5 | -2/+83 |
|\ | | | | | | | | | | | | | | | | | 'move-pipeline_default-update_head_pipeline_for_merge_request-queue-to-pipeline_processing-namespace' into 'master' Move update_head_pipeline_for_merge_request queue to `pipeline_processing` namespace Closes #43919 See merge request gitlab-org/gitlab-ce!17572 | ||||
| * | Change queue namespace of UpdateHeadPipelineForMergeRequestWorker | Shinya Maeda | 2018-03-07 | 1 | -0/+2 |
| | | |||||
| * | Move update_head_pipeline_for_merge_request queue to pipeline_processing ↵ | Shinya Maeda | 2018-03-07 | 4 | -2/+81 |
| | | | | | | | | namespace | ||||
* | | Merge branch 'sha256-checksum-for-trace' into 'master' | Kamil Trzciński | 2018-03-06 | 2 | -5/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | Set sha256 checksum when archiving traces Closes #43940 See merge request gitlab-org/gitlab-ce!17570 | ||||
| * | | Fix false positive spec of using digest instead of hexdigest | Shinya Maeda | 2018-03-07 | 1 | -4/+4 |
| | | | |||||
| * | | Set sha256 checksum when archiving traces | Shinya Maeda | 2018-03-07 | 2 | -1/+4 |
| |/ | |||||
* | | Merge branch 'ce-3727-fe-labels-for-epics' into 'master' | Filipa Lacerda | 2018-03-06 | 3 | -5/+7 |
|\ \ | | | | | | | | | | | | | CE Port: Add `js-` classes in LabelsSelect component See merge request gitlab-org/gitlab-ce!17558 | ||||
| * | | Backport description composition from EEce-3727-fe-labels-for-epics | Kushal Pandya | 2018-03-06 | 1 | -2/+4 |
| | | | |||||
| * | | Add `js-*` class to refer in JS | Kushal Pandya | 2018-03-06 | 2 | -3/+3 |
| | | | |||||
* | | | Merge branch 'cluster-monitoring-changes-ce-backport' into 'master' | Phil Hughes | 2018-03-06 | 12 | -108/+225 |
|\ \ \ | | | | | | | | | | | | | | | | | Cluster monitoring changes CE backport See merge request gitlab-org/gitlab-ce!17547 | ||||
| * | | | prefer checking explicitly for null | Mike Greiling | 2018-03-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | replace fixture with simple mount point | Mike Greiling | 2018-03-06 | 2 | -39/+6 |
| | | | | |||||
| * | | | add new tests for metrics dashboard changes | Mike Greiling | 2018-03-06 | 1 | -9/+34 |
| | | | | |||||
| * | | | move misplaced entry pointcluster-monitoring-changes-ce-backport | Mike Greiling | 2018-03-06 | 1 | -0/+0 |
| | | | | |||||
| * | | | coerce hasMetrics to a boolean value before instantiating the Vue component | Mike Greiling | 2018-03-06 | 3 | -7/+11 |
| | | | | |||||
| * | | | prefer getElementById | Mike Greiling | 2018-03-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix karma tests | Mike Greiling | 2018-03-06 | 1 | -1/+16 |
| | | | | |||||
| * | | | remove prometheus panel styling on cluster monitoring page | Mike Greiling | 2018-03-06 | 2 | -1/+21 |
| | | | | |||||
| * | | | lighten axis tick text | Mike Greiling | 2018-03-06 | 1 | -1/+2 |
| | | | | |||||
| * | | | add ability to override graph size measurements | Mike Greiling | 2018-03-06 | 2 | -1/+12 |
| | | | | |||||
| * | | | fix spacing around axis label text in small breakpoints | Mike Greiling | 2018-03-06 | 1 | -2/+3 |
| | | | | |||||
| * | | | hide legend without hiding the axis labels | Mike Greiling | 2018-03-06 | 2 | -35/+42 |
| | | | | |||||
| * | | | add option to hide the graph legend | Mike Greiling | 2018-03-06 | 2 | -1/+15 |
| | | | | |||||
| * | | | use proper dependency injection for monitoring dashboard component | Mike Greiling | 2018-03-06 | 3 | -23/+69 |
| | | | | |||||
| * | | | make deployments endpoint optional | Mike Greiling | 2018-03-06 | 1 | -0/+3 |
| | | | | |||||
| * | | | add prometheus cluster health monitoring empty state | Mike Greiling | 2018-03-06 | 1 | -1/+4 |
| | | | | |||||
* | | | | Merge branch 'issue_38337' into 'master' | Sean McGivern | 2018-03-06 | 67 | -469/+1730 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring one group board to CE Closes #38337 See merge request gitlab-org/gitlab-ce!17274 | ||||
| * \ \ \ | Merge branch 'master' into 'issue_38337' | Felipe Artur | 2018-03-06 | 543 | -11966/+29559 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb | ||||
| * | | | | | Fix a typo, a conflict and improve documentationissue_38337 | Felipe Artur | 2018-03-06 | 3 | -2/+5 |
| | | | | | | |||||
| * | | | | | Address review comments | Felipe Artur | 2018-03-05 | 9 | -47/+31 |
| | | | | | | |||||
| * | | | | | Bring one group board to CE | Felipe Artur | 2018-03-03 | 66 | -469/+1744 |
| | | | | | | |||||
* | | | | | | Merge branch 'prepend-grape-api-ce' into 'master' | Rémy Coutable | 2018-03-06 | 1 | -21/+40 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify lib/api/merge_requests.rb with EE See merge request gitlab-org/gitlab-ce!17539 | ||||
| * | | | | | | Unify lib/api/merge_requests.rb with EEprepend-grape-api-ce | Lin Jen-Shin | 2018-03-06 | 1 | -21/+40 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'rc/speedup-rake-jobs' into 'master' | Robert Speicher | 2018-03-06 | 1 | -131/+113 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | Speedup CI jobs See merge request gitlab-org/gitlab-ce!14911 | ||||
| * | | | | | | New .dedicated-no-docs-pull-cache-job and .no-db-job definitions | Rémy Coutable | 2018-03-06 | 1 | -136/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should speed up a bit some jobs. Also, use ruby:2.4-alpine image in the flaky-examples-check job Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Add date calls in .gitlab-ci.yml to see how long each step take | Rémy Coutable | 2018-03-06 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | Merge branch 'docs-devguide-cherry-pick-ce-to-ee' into 'master' | Achilleas Pipinellis | 2018-03-06 | 2 | -2/+140 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs guidelines: cherry-picking commits from CE to EE Closes #41338 and #28822 See merge request gitlab-org/gitlab-ce!17367 | ||||
| * | | | | | | | Docs guidelines: cherry-picking commits from CE to EE | Marcia Ramos | 2018-03-06 | 2 | -2/+140 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master' | Grzegorz Bizon | 2018-03-06 | 30 | -370/+403 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring changes to support cluster metrics in EE Closes #42820 See merge request gitlab-org/gitlab-ce!17336 | ||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵5029-support-cluster-metrics-ce | Pawel Chojnacki | 2018-03-06 | 1193 | -16194/+18833 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5029-support-cluster-metrics-ce # Conflicts: # spec/models/clusters/applications/prometheus_spec.rb | ||||
| * | | | | | | Arg.id via method pointer | Pawel Chojnacki | 2018-03-06 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | one space too far | Pawel Chojnacki | 2018-03-05 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Check if prometheus_adapter is properly called | Pawel Chojnacki | 2018-03-05 | 3 | -32/+21 |
| | | | | | | | |||||
| * | | | | | | Implemente Prometheus:AdapterService | Pawel Chojnacki | 2018-03-05 | 5 | -30/+84 |
| | | | | | | | |||||
| * | | | | | | add missing newline | Pawel Chojnacki | 2018-03-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Implement PrometheusDeploymentLocator + fix metrics controller | Pawel Chojnacki | 2018-03-01 | 4 | -27/+31 |
| | | | | | | | |||||
| * | | | | | | use deployment_platform DI in environment and revert changes to k8s cert ↵ | Pawel Chojnacki | 2018-02-26 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | verification policy | ||||
| * | | | | | | Fix failing test, when deployment platform is not bound to a cluster. | Pawel Chojnacki | 2018-02-26 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | drop the ! from synchronize_service_state! + remove unused scope | Pawel Chojnacki | 2018-02-24 | 3 | -5/+3 |
| | | | | | | |