summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove allow_n_plus_1 from MergeRequest#create_merge_request_diffremove-mr-diffs-n-plus-1Ahmad Sherif2018-02-071-6/+2
* Merge branch 'osw-remove-duplicate-can-be-reverted-calls' into 'master'Stan Hu2018-02-072-2/+14
|\
| * Address naming suggestionOswaldo Ferreira2018-02-071-4/+3
| * Remove duplicate calls of MergeRequest#can_be_reverted?Oswaldo Ferreira2018-02-072-2/+15
* | Merge branch 'fix_help_controller_spec' into 'master'Sean McGivern2018-02-071-1/+1
|\ \ | |/ |/|
| * Updating `HelpController` spec to use an existing imageMario de la Ossa2018-02-071-1/+1
* | Merge branch '4656-ce-port-filtered-search-bar' into 'master'Clement Ho2018-02-0715-81/+108
|\ \ | |/ |/|
| * Import FilteredSearchTokenKeys, update class initialization syntax4656-ce-port-filtered-search-barKushal Pandya2018-02-071-5/+6
| * Import and use `FilteredSearchTokenKeys` independentlyKushal Pandya2018-02-075-27/+30
| * Update class initialization syntaxKushal Pandya2018-02-075-6/+14
| * Export class instead of assigning to `gl`Kushal Pandya2018-02-071-4/+1
| * Make class initialization configurableKushal Pandya2018-02-072-38/+57
| * Remove `FilteredSearchTokenKeys` importKushal Pandya2018-02-071-1/+0
* | 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.sc...ce-4813-fix-ee-projects-destroy_service_specRémy Coutable2018-02-074-19/+15
* | | Merge branch 'clear-job-request-timeout' into 'master'Filipa Lacerda2018-02-072-19/+28
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
| * | | | Make prometheus service querying approach much nicer wrt to arity and default...Pawel Chojnacki2018-02-074-4/+30
| * | | | 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
| |\ \ \ \
| * | | | | 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
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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 '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2...Mike Greiling2018-01-291-76/+64
| |\ \ \ \ \ \
| | * | | | | | Fix values.yaml for PrometheusJoshua Lambert2018-01-261-76/+64
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-291026-10120/+17067
| |\ \ \ \ \ \ \
| * | | | | | | | 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/connect_to_promethe...Pawel Chojnacki2018-01-171388-13895/+36568
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add Changelog itemPawel Chojnacki2018-01-041-0/+6
| * | | | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-044-13/+19
View Lorry Controller Status