Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove layout nav from scroll calculationfix-sidebar-scroll-jump | Annabel Dunstone Gray | 2017-06-22 | 1 | -3/+1 |
| | |||||
* | Merge branch 'rs-revert-bootsnap' into 'master' | Stan Hu | 2017-06-22 | 3 | -17/+0 |
|\ | | | | | | | | | | | | | Revert "Merge branch 'rs-bootsnap' into 'master'" Closes #34134, #34106, and #34084 See merge request !12389 | ||||
| * | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnap | Robert Speicher | 2017-06-22 | 3 | -17/+0 |
| | | | | | | | | | | This reverts commit 95138a9c16a2d1905354d0f46381b3822b37863d, reversing changes made to 66aad16d1aaa426237e52ef19385385566f194dc. | ||||
* | | Merge branch '33981-add-members-drop-down-doesn-t-separate-name-username' ↵ | Annabel Dunstone Gray | 2017-06-22 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve ""Add Members" drop-down doesn't separate Name/Username" Closes #33981 See merge request !12376 | ||||
| * | | Resolve ""Add Members" drop-down doesn't separate Name/Username" | Tim Zallmann | 2017-06-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master' | Yorick Peterse | 2017-06-22 | 2 | -14/+81 |
|\ \ | | | | | | | | | | | | | Add `datetime_with_timezone` to table definition See merge request !12292 | ||||
| * | | Fix MySQL schema dump for `timestamp`mk-add-datetime-with-timezone-table-definition | Michael Kozono | 2017-06-22 | 1 | -4/+30 |
| | | | |||||
| * | | Fix PostgreSQL schema dump for `timestamptz` | Michael Kozono | 2017-06-22 | 1 | -5/+36 |
| | | | |||||
| * | | Add `datetime_with_timezone` to table definition | Michael Kozono | 2017-06-22 | 1 | -6/+16 |
| | | | | | | | | | | | | So the method can be used in a `create_table` block. There is a new Rubocop style cop that requires the usage of `datetime_with_timezone`. | ||||
* | | | Merge branch '33940-cache-flipper_gate-query' into 'master' | Robert Speicher | 2017-06-22 | 2 | -2/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add the Flipper::Middleware::Memoizer middleware Closes #33940 See merge request !12359 | ||||
| * | | | Fix Style/EmptyLines violation in lib/feature.rb33940-cache-flipper_gate-query | Robert Speicher | 2017-06-22 | 1 | -1/+0 |
| | | | | |||||
| * | | | Add the Flipper::Middleware::Memoizer middleware | Rémy Coutable | 2017-06-21 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we make maximum one call per feature per request. See https://github.com/jnunemaker/flipper/blob/v0.10.2/docs/Optimization.md#memoizing-middleware Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch 'awards-handler-class-syntax' into 'master' | Jacob Schatz | 2017-06-22 | 1 | -379/+374 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor AwardsHandler into ES class syntax See merge request !12239 | ||||
| * | | | | refactor AwardsHandler into es class syntaxawards-handler-class-syntax | Mike Greiling | 2017-06-17 | 1 | -379/+374 |
| | | | | | |||||
* | | | | | Merge branch 'fix/properly-encode-gitaly-diffs' into 'master' | Robert Speicher | 2017-06-22 | 3 | -2/+13 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Encode Gitaly diff patches properly See merge request !12368 | ||||
| * | | | | Encode Gitaly diff patches properlyfix/properly-encode-gitaly-diffs | Ahmad Sherif | 2017-06-22 | 3 | -2/+13 |
| | | | | | |||||
* | | | | | Merge branch '28717-additional-metrics-review-branch' into 'master' | Grzegorz Bizon | 2017-06-22 | 51 | -57/+1969 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support additional prometheus metrics - review branch Closes #28717 See merge request !11712 | ||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branch | Pawel Chojnacki | 2017-06-22 | 1036 | -5914/+10545 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch | ||||
| * | | | | | | Add Changelog message | Pawel Chojnacki | 2017-06-21 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Make queries not die when underlying data cannot be found | Pawel Chojnacki | 2017-06-20 | 5 | -46/+50 |
| | | | | | | | |||||
| * | | | | | | Add rescue_from(ActionController::UnknownFormat) in Application Controller | Pawel Chojnacki | 2017-06-20 | 5 | -12/+50 |
| | | | | | | | |||||
| * | | | | | | Remove unnecessary prometheus_service method, that is now handled by new ↵ | Pawel Chojnacki | 2017-06-20 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | automagic within Project model | ||||
| * | | | | | | Memoize only yaml loading method | Pawel Chojnacki | 2017-06-16 | 2 | -7/+2 |
| | | | | | | | |||||
| * | | | | | | move additional_metrics.yaml into prometheus/ config folder | Pawel Chojnacki | 2017-06-16 | 3 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Move Prometheus service to project model | Pawel Chojnacki | 2017-06-16 | 8 | -24/+21 |
| | | | | | | | |||||
| * | | | | | | Fix prometheus service frontend fixture | Pawel Chojnacki | 2017-06-16 | 2 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Pawel Chojnacki | 2017-06-16 | 1189 | -7088/+21912 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch | ||||
| * | | | | | | | cleanup wip | Pawel Chojnacki | 2017-06-16 | 3 | -6/+9 |
| | | | | | | | | |||||
| * | | | | | | | Use include ActiveModel::Model to hold metrics data parsed from yaml. | Pawel Chojnacki | 2017-06-16 | 5 | -43/+32 |
| | | | | | | | | |||||
| * | | | | | | | Test Additional metrics parser and fix query checking tests | Pawel Chojnacki | 2017-06-09 | 5 | -11/+265 |
| | | | | | | | | |||||
| * | | | | | | | Fix Additional metrics filtering | Pawel Chojnacki | 2017-06-08 | 5 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + remove test button that was leftover after a bad merge | ||||
| * | | | | | | | Use `key?` instead of `has_key?` | Pawel Chojnacki | 2017-06-07 | 2 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Pawel Chojnacki | 2017-06-07 | 973 | -6054/+18885 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch # Conflicts: # app/models/project_services/prometheus_service.rb # app/views/projects/services/_form.html.haml | ||||
| * | | | | | | | | Remove unecessary before block | Pawel Chojnacki | 2017-06-07 | 1 | -4/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Use explicit instance of prometheus service and add access methods to it | Pawel Chojnacki | 2017-06-07 | 9 | -33/+136 |
| | | | | | | | | | |||||
| * | | | | | | | | Add schema matcher for non response objects + use schema to test additional ↵ | Pawel Chojnacki | 2017-06-06 | 4 | -71/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metrics compliance | ||||
| * | | | | | | | | expand Namespaces:: and refactoring yaml parsing out of MetricGroup class | Pawel Chojnacki | 2017-06-06 | 16 | -239/+282 |
| | | | | | | | | | |||||
| * | | | | | | | | Explicitly require format.json in prometheus_controller | Pawel Chojnacki | 2017-06-06 | 3 | -7/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + add missing prometheus_controller tests! | ||||
| * | | | | | | | | Fix prometheus service tests | Pawel Chojnacki | 2017-06-06 | 2 | -2/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix transient error in deployment test | Pawel Chojnacki | 2017-06-06 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove orig file + rubocop cleanup | Pawel Chojnacki | 2017-06-05 | 6 | -26/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Cleanup Additional Metrics tests | Pawel Chojnacki | 2017-06-05 | 6 | -68/+20 |
| | | | | | | | | | |||||
| * | | | | | | | | Refactor Metric tests to use more common code | Pawel Chojnacki | 2017-06-05 | 3 | -19/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Additional Metrics of deployment tests | Pawel Chojnacki | 2017-06-05 | 4 | -142/+179 |
| | | | | | | | | | |||||
| * | | | | | | | | Environments#additional_metrics tests | Pawel Chojnacki | 2017-06-05 | 2 | -0/+133 |
| | | | | | | | | | |||||
| * | | | | | | | | Test Partial additional query response | Pawel Chojnacki | 2017-06-05 | 1 | -9/+45 |
| | | | | | | | | | |||||
| * | | | | | | | | Additional metrics test using multiple groups | Pawel Chojnacki | 2017-06-05 | 3 | -32/+111 |
| | | | | | | | | | |||||
| * | | | | | | | | Additional Metrics tests | Pawel Chojnacki | 2017-06-05 | 6 | -18/+126 |
| | | | | | | | | | |||||
| * | | | | | | | | Towards Reviewable prometheus | Pawel Chojnacki | 2017-06-05 | 4 | -35/+146 |
| | | | | | | | | | |||||
| * | | | | | | | | Matched Metrics tests | Pawel Chojnacki | 2017-06-05 | 5 | -39/+97 |
| | | | | | | | | |