summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add pot file for translation tagsinternationalize-charts-pageShah El-Rahman2018-02-071-2/+29
|
* Add changelogShah El-Rahman2018-02-071-0/+5
|
* Annotate charts page for internationalizationShah El-Rahman2018-02-071-13/+18
|
* Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master'Sean McGivern2018-02-074-19/+15
|\ | | | | | | | | | | | | Reset column information after the schema is migrated in MigrationsHelpers.schema_migrate_up! Closes gitlab-ee#4813 See merge request gitlab-org/gitlab-ce!16950
| * Reset column information after the schema is migrated in ↵ce-4813-fix-ee-projects-destroy_service_specRémy Coutable2018-02-074-19/+15
| | | | | | | | | | | | MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'clear-job-request-timeout' into 'master'Filipa Lacerda2018-02-072-19/+28
|\ \ | | | | | | | | | | | | | | | | | | Clear the timeout in Jobs class after each test Closes #42830 See merge request gitlab-org/gitlab-ce!16969
| * | Clear the timeout in Jobs class after each testPhil Hughes2018-02-072-19/+28
| | |
* | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-0747-118/+612
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
| * | | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480Pawel Chojnacki2018-02-072-0/+12
| | | |
| * | | Avoid unless/elsePawel Chojnacki2018-02-071-4/+4
| | | |
| * | | Fix order of checks in editable? method.Pawel Chojnacki2018-02-073-6/+7
| | | | | | | | | | | | | | | | + address small nitpicks
| * | | Make prometheus service querying approach much nicer wrt to arity and ↵Pawel Chojnacki2018-02-074-4/+30
| | | | | | | | | | | | | | | | default function params
| * | | add i8n to the Prometheus integration settings pageMike Greiling2018-02-061-8/+8
| | | |
| * | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-06715-4180/+11964
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
| * | | | fix tests for find or initialize service 'prometheus'Pawel Chojnacki2018-02-061-1/+1
| | | | |
| * | | | use find_or_initialize to fetch prometheus_service instancePawel Chojnacki2018-02-061-1/+1
| | | | |
| * | | | remove unnecessary commentPawel Chojnacki2018-02-061-1/+0
| | | | |
| * | | | fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests ↵Mike Greiling2018-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | where project is nil
| * | | | fix broken karma specs due to removed functionMike Greiling2018-01-312-28/+2
| | | | |
| * | | | style the prometheus integration service page according to designMike Greiling2018-01-313-10/+33
| | | | |
| * | | | hide prometheus manual integration form when auto config is activeMike Greiling2018-01-312-18/+27
| | | | |
| * | | | change prometheus service description text to match designMike Greiling2018-01-3118-18/+18
| | | | |
| * | | | add link to cluster configuration from prometheus "getting started" stateMike Greiling2018-01-314-10/+31
| | | | |
| * | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-31185-1665/+3243
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
| * | | | | fix eslint and formatting issuesMike Greiling2018-01-311-4/+4
| | | | | |
| * | | | | display manage application button only when it is installedMike Greiling2018-01-311-2/+5
| | | | | |
| * | | | | internationalize the "Manage" button labelMike Greiling2018-01-301-1/+4
| | | | | |
| * | | | | add button to configure prometheus integration from cluster pageMike Greiling2018-01-303-1/+9
| | | | | |
| * | | | | add manage button to application rows in cluster integrationMike Greiling2018-01-302-5/+28
| | | | | |
| * | | | | Fix rubocopPawel Chojnacki2018-01-301-0/+1
| | | | | |
| * | | | | enable manual configuration property for all test prometheus servicesPawel Chojnacki2018-01-301-1/+2
| | | | | |
| * | | | | fix service generic testsPawel Chojnacki2018-01-301-4/+1
| | | | | |
| * | | | | Merge branch ↵Mike Greiling2018-01-291-76/+64
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1' into pawel/connect_to_prometheus_through_proxy-30480 * 42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1: Fix values.yaml for Prometheus
| | * | | | | Fix values.yaml for PrometheusJoshua Lambert2018-01-261-76/+64
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-291026-10120/+17067
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * | | | | | | check if service is templatePawel Chojnacki2018-01-171-0/+1
| | | | | | | |
| * | | | | | | add manual_configuration to prometheus_service factory to enable it by defaultPawel Chojnacki2018-01-171-0/+1
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-171388-13895/+36568
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * | | | | | | | Add Changelog itemPawel Chojnacki2018-01-041-0/+6
| | | | | | | | |
| * | | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-044-13/+19
| | | | | | | | |
| * | | | | | | | Test Prometheus proxy client generationPawel Chojnacki2018-01-042-2/+58
| | | | | | | | |
| * | | | | | | | add tests for Manual configuration override and service activation ↵Pawel Chojnacki2018-01-041-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronization
| * | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-043-49/+52
| | | | | | | | |
| * | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-045-19/+147
| | | | | | | | |
| * | | | | | | | Fix prometheus client testsPawel Chojnacki2018-01-042-10/+21
| | | | | | | | |
| * | | | | | | | Add test checking if prometheus integration is enabled after prometheus is ↵Pawel Chojnacki2018-01-048-24/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed
| * | | | | | | | Auto enable prometheus service if Prometheus is InstalledPawel Chojnacki2018-01-021-4/+6
| | | | | | | | |
| * | | | | | | | Manual Configuration instead of Activation. Prometheus Service just got a ↵Pawel Chojnacki2018-01-022-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bit weirder
| * | | | | | | | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-023-44/+22
| | | | | | | | |
| * | | | | | | | wipPawel Chojnacki2018-01-026-28/+99
| | | | | | | | |
View Lorry Controller Status