summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove spec/lib/api/helpers/csrf_tokens_spec.rb33601-add-csrf-token-verification-to-apiblackst0ne2017-06-261-42/+0
* Add `rescue false`.blackst0ne2017-06-263-3/+3
* Refactor CSRF protectionblackst0ne2017-06-264-34/+8
* Add CSRF token verification to APIblackst0ne2017-06-263-5/+81
* Merge branch 'project-settings-container-width' into 'master'Annabel Dunstone Gray2017-06-2312-50/+52
|\
| * Added limited width container to project settingsPhil Hughes2017-06-2012-50/+52
* | Merge branch 'fix-dropdown-top-navbar-position-mobile' into 'master'Annabel Dunstone Gray2017-06-232-0/+6
|\ \
| * | Fix dropdown position for the new button on mobile for the top navbarJose Ivan Vargas Lopez2017-06-232-0/+6
|/ /
* | Merge branch 'rs-revert-bootsnap' into 'master'Stan Hu2017-06-223-17/+0
|\ \
| * | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-223-17/+0
* | | Merge branch '33981-add-members-drop-down-doesn-t-separate-name-username' int...Annabel Dunstone Gray2017-06-221-1/+1
|\ \ \
| * | | 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
|\ \ \
| * | | 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
* | | | Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-222-2/+4
|\ \ \ \
| * | | | 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
* | | | | Merge branch 'awards-handler-class-syntax' into 'master'Jacob Schatz2017-06-221-379/+374
|\ \ \ \ \
| * | | | | 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 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
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-221036-5914/+10545
| |\ \ \ \ \ \
| * | | | | | | 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 auto...Pawel Chojnacki2017-06-201-4/+0
| * | | | | | | 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 28717-additional-metrics-...Pawel Chojnacki2017-06-161189-7088/+21912
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | Use `key?` instead of `has_key?`Pawel Chojnacki2017-06-072-3/+3
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-07973-6054/+18885
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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 m...Pawel Chojnacki2017-06-064-71/+88
| * | | | | | | | | 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
| * | | | | | | | | 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
View Lorry Controller Status