summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove layout nav from scroll calculationfix-sidebar-scroll-jumpAnnabel Dunstone Gray2017-06-221-3/+1
|
* Merge branch 'rs-revert-bootsnap' into 'master'Stan Hu2017-06-223-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-bootsnapRobert Speicher2017-06-223-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 Gray2017-06-221-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 Zallmann2017-06-221-1/+1
|/ /
* | Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master'Yorick Peterse2017-06-222-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-definitionMichael Kozono2017-06-221-4/+30
| | |
| * | Fix PostgreSQL schema dump for `timestamptz`Michael Kozono2017-06-221-5/+36
| | |
| * | Add `datetime_with_timezone` to table definitionMichael Kozono2017-06-221-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 Speicher2017-06-222-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-queryRobert Speicher2017-06-221-1/+0
| | | |
| * | | Add the Flipper::Middleware::Memoizer middlewareRémy Coutable2017-06-212-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 Schatz2017-06-221-379/+374
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor AwardsHandler into ES class syntax See merge request !12239
| * | | | refactor AwardsHandler into es class syntaxawards-handler-class-syntaxMike Greiling2017-06-171-379/+374
| | | | |
* | | | | Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'Robert Speicher2017-06-223-2/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Encode Gitaly diff patches properly See merge request !12368
| * | | | Encode Gitaly diff patches properlyfix/properly-encode-gitaly-diffsAhmad Sherif2017-06-223-2/+13
| | | | |
* | | | | Merge branch '28717-additional-metrics-review-branch' into 'master'Grzegorz Bizon2017-06-2251-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-branchPawel Chojnacki2017-06-221036-5914/+10545
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * | | | | | Add Changelog messagePawel Chojnacki2017-06-211-0/+4
| | | | | | |
| * | | | | | Make queries not die when underlying data cannot be foundPawel Chojnacki2017-06-205-46/+50
| | | | | | |
| * | | | | | Add rescue_from(ActionController::UnknownFormat) in Application ControllerPawel Chojnacki2017-06-205-12/+50
| | | | | | |
| * | | | | | Remove unnecessary prometheus_service method, that is now handled by new ↵Pawel Chojnacki2017-06-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | automagic within Project model
| * | | | | | Memoize only yaml loading methodPawel Chojnacki2017-06-162-7/+2
| | | | | | |
| * | | | | | move additional_metrics.yaml into prometheus/ config folderPawel Chojnacki2017-06-163-2/+2
| | | | | | |
| * | | | | | Move Prometheus service to project modelPawel Chojnacki2017-06-168-24/+21
| | | | | | |
| * | | | | | Fix prometheus service frontend fixturePawel Chojnacki2017-06-162-3/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-161189-7088/+21912
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * | | | | | | cleanup wipPawel Chojnacki2017-06-163-6/+9
| | | | | | | |
| * | | | | | | Use include ActiveModel::Model to hold metrics data parsed from yaml.Pawel Chojnacki2017-06-165-43/+32
| | | | | | | |
| * | | | | | | Test Additional metrics parser and fix query checking testsPawel Chojnacki2017-06-095-11/+265
| | | | | | | |
| * | | | | | | Fix Additional metrics filteringPawel Chojnacki2017-06-085-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + remove test button that was leftover after a bad merge
| * | | | | | | Use `key?` instead of `has_key?`Pawel Chojnacki2017-06-072-3/+3
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-07973-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 blockPawel Chojnacki2017-06-071-4/+0
| | | | | | | | |
| * | | | | | | | Use explicit instance of prometheus service and add access methods to itPawel Chojnacki2017-06-079-33/+136
| | | | | | | | |
| * | | | | | | | Add schema matcher for non response objects + use schema to test additional ↵Pawel Chojnacki2017-06-064-71/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metrics compliance
| * | | | | | | | expand Namespaces:: and refactoring yaml parsing out of MetricGroup classPawel Chojnacki2017-06-0616-239/+282
| | | | | | | | |
| * | | | | | | | Explicitly require format.json in prometheus_controllerPawel Chojnacki2017-06-063-7/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + add missing prometheus_controller tests!
| * | | | | | | | Fix prometheus service testsPawel Chojnacki2017-06-062-2/+16
| | | | | | | | |
| * | | | | | | | Fix transient error in deployment testPawel Chojnacki2017-06-061-0/+4
| | | | | | | | |
| * | | | | | | | Remove orig file + rubocop cleanupPawel Chojnacki2017-06-056-26/+13
| | | | | | | | |
| * | | | | | | | Cleanup Additional Metrics testsPawel Chojnacki2017-06-056-68/+20
| | | | | | | | |
| * | | | | | | | Refactor Metric tests to use more common codePawel Chojnacki2017-06-053-19/+16
| | | | | | | | |
| * | | | | | | | Additional Metrics of deployment testsPawel Chojnacki2017-06-054-142/+179
| | | | | | | | |
| * | | | | | | | Environments#additional_metrics testsPawel Chojnacki2017-06-052-0/+133
| | | | | | | | |
| * | | | | | | | Test Partial additional query responsePawel Chojnacki2017-06-051-9/+45
| | | | | | | | |
| * | | | | | | | Additional metrics test using multiple groupsPawel Chojnacki2017-06-053-32/+111
| | | | | | | | |
| * | | | | | | | Additional Metrics testsPawel Chojnacki2017-06-056-18/+126
| | | | | | | | |
| * | | | | | | | Towards Reviewable prometheusPawel Chojnacki2017-06-054-35/+146
| | | | | | | | |
| * | | | | | | | Matched Metrics testsPawel Chojnacki2017-06-055-39/+97
| | | | | | | | |
View Lorry Controller Status