summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improved spec coverage on prometheus_graph.jsprometheus-graphsJose Ivan Vargas2017-03-032-55/+57
* Added initial version of specsJose Ivan Vargas2017-03-033-0/+1107
* Changed the getData method a $.ajax callJose Ivan Vargas2017-03-033-35/+21
* Code cleanupJose Ivan Vargas2017-03-033-94/+128
* Improvements to the design and code cleanupJose Ivan Vargas2017-03-034-140/+235
* Created initial version of the graphJose Ivan Vargas2017-03-034-0/+322
* Address failing API tests.Joshua Lambert2017-03-032-0/+17
* Resolve rubocop failures.Joshua Lambert2017-03-032-3/+4
* Add a controller test and tweak the view a bitRémy Coutable2017-03-025-7/+60
* Fix wording of API URL default textJoshua Lambert2017-02-281-2/+2
* Adjust CPU metrics for 2min rate.Joshua Lambert2017-02-281-2/+2
* Update Prometheus queries for CPU and Memory.Joshua Lambert2017-02-281-4/+6
* Change query to be a simple scalar to reduce load and any chance for failure.Joshua Lambert2017-02-281-1/+1
* Change Prometheus test ping to a functional query so it returns success.Joshua Lambert2017-02-281-1/+1
* Include last_update in responseKamil Trzcinski2017-02-281-1/+2
* Fetch monitoring data from PrometheusKamil Trzcinski2017-02-285-21/+102
* Added metrics viewsKamil Trzcinski2017-02-283-0/+19
* Added metrics endpoint to EnvironmentsControllerKamil Trzcinski2017-02-283-1/+23
* Add PrometheusService with API URLKamil Trzcinski2017-02-284-0/+97
* Merge branch 'patch-14' into 'master' Filipa Lacerda2017-02-281-0/+5
|\
| * Add newline to end of frontend.md.patch-14Bryce Johnson2017-02-281-1/+1
| * Document use of AirBnb js styleguide and eslint.Bryce Johnson2017-02-281-0/+5
* | Merge branch 'issue-tags-layout' into 'master' Annabel Dunstone Gray2017-02-282-1/+5
|\ \
| * | Fix 'New Tag' layout on Tags pageRobert Marcano2017-02-132-1/+5
* | | Merge branch '6073_project_api' into 'master' Sean McGivern2017-02-286-10/+70
|\ \ \
| * | | API project create: Make name or path requiredJarka Kadlecova2017-02-276-10/+70
* | | | Update CHANGELOG.md for 8.17.126790-no-label-color-todosJames Lopez2017-02-2812-44/+15
* | | | Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master' Dmitriy Zaporozhets2017-02-282-3/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't allow a project to be shared with an ancestor of the group it is inDouwe Maan2017-02-282-3/+25
* | | | Merge branch '27354-navigation-new-button' into 'master' Dmitriy Zaporozhets2017-02-283-0/+9
|\ \ \ \
| * | | | Put back the new project button27354-navigation-new-buttonAnnabel Dunstone Gray2017-02-223-0/+9
* | | | | Merge branch 'dm-nested-group-shared-projects' into 'master' Dmitriy Zaporozhets2017-02-284-5/+91
|\ \ \ \ \
| * | | | | Fix access to projects shared with a nested groupdm-nested-group-shared-projectsDouwe Maan2017-02-284-5/+91
| | |/ / / | |/| | |
* | | | | Merge branch 'dz-rubocop-skip-builds' into 'master' Dmitriy Zaporozhets2017-02-281-0/+1
|\ \ \ \ \
| * | | | | Ignore builds dir when run rubocop checkdz-rubocop-skip-buildsDmitriy Zaporozhets2017-02-281-0/+1
| |/ / / /
* | | | | Merge branch '28769-raise-custom-exception-in-all-methods-of-mergeservice-tha...Rémy Coutable2017-02-281-11/+9
|\ \ \ \ \
| * | | | | Use exceptions for MergeService error handling28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-userSean McGivern2017-02-281-11/+9
* | | | | | Merge branch 'api-empty-return' into 'master' Sean McGivern2017-02-28100-477/+1611
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | New runner API returns 204api-empty-returnRobert Schilling2017-02-282-2/+5
| * | | | | Backport new behavior to CI APIRobert Schilling2017-02-282-0/+3
| * | | | | Backport API to V3Robert Schilling2017-02-2836-28/+1485
| * | | | | Update documentationRobert Schilling2017-02-2816-306/+5
| * | | | | Return 204 for delete endpointsRobert Schilling2017-02-2846-142/+114
* | | | | | Merge branch 'ee-compat-code-review' into 'master' Rémy Coutable2017-02-281-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Clarify when to create EE compatibility MR in code review processAdam Niedzielski2017-02-281-0/+6
|/ / / / /
* | | | | Merge branch 'only-create-unmergeable-todo-once' into 'master' Kamil Trzciński2017-02-285-11/+34
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-245-11/+34
* | | | | Merge branch 'fix-migration-downtime' into 'master' Rubén Dávila Santos2017-02-281-0/+2
|\ \ \ \ \
| * | | | | Fix migration without DOWNTIME clause specifiedRuben Davila2017-02-281-0/+2
|/ / / / /
* | | | | Merge branch 'fix-rubocop' into 'master' cherry-picking-regressions-8.17.0Robert Speicher2017-02-271-1/+1
|\ \ \ \ \
View Lorry Controller Status