summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix interpolation in app/views/profile/show.html/hamlNick Thomas2017-06-241-1/+1
* Merge branch 'tc-refactor-projects-finder-init-collection' into 'master'Douwe Maan2017-06-233-2/+8
|\
| * Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collectionToon Claes2017-06-233-2/+8
* | Merge branch 'mk-fix-breadcrumb-order-33938' into 'master'Douwe Maan2017-06-231-1/+1
|\ \
| * | Fix breadcrumb orderMichael Kozono2017-06-221-1/+1
* | | Merge branch 'mk-fix-issue-34068' into 'master'Douwe Maan2017-06-231-2/+2
|\ \ \
| * | | Fix 500 on create group failuresMichael Kozono2017-06-231-2/+2
* | | | Merge branch '34219-extra-symbol-notifications-modal' into 'master'Phil Hughes2017-06-231-1/+1
|\ \ \ \
| * | | | Remove extra symbol in notifications modal34219-extra-symbol-notifications-modalAnnabel Dunstone Gray2017-06-231-1/+1
* | | | | Limit the width of commit & snippet comment sectionsPhil Hughes2017-06-235-9/+14
* | | | | Limit the width of project READMEsPhil Hughes2017-06-234-2/+9
* | | | | Make JavaScript tests fail for unhandled Promise rejectionsWinnie Hellmann2017-06-233-7/+10
* | | | | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-232-74/+43
|\ \ \ \ \
| * | | | | Convert app/views/profiles/show.html.haml to bootstrap_formNick Thomas2017-06-222-74/+43
* | | | | | Merge branch '33992-mr-target-avatar' into 'master'Phil Hughes2017-06-231-1/+1
|\ \ \ \ \ \
| * | | | | | Add padding to target branch container33992-mr-target-avatarAnnabel Dunstone Gray2017-06-211-1/+1
* | | | | | | Merge branch 'fix-sidebar-scroll-jump' into 'master'Phil Hughes2017-06-231-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove layout nav from scroll calculationfix-sidebar-scroll-jumpAnnabel Dunstone Gray2017-06-221-3/+1
* | | | | | | | Fix offset for fixed navAnnabel Dunstone Gray2017-06-232-3/+14
* | | | | | | | Merge branch 'notes-es-class-syntax' into 'master'Tim Zallmann2017-06-231-1374/+1356
|\ \ \ \ \ \ \ \
| * | | | | | | | refactor Notes class to ES class syntaxnotes-es-class-syntaxMike Greiling2017-06-221-1374/+1356
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'dm-unnecessary-top-padding' into 'master'Sean McGivern2017-06-231-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary top padding on group MR indexdm-unnecessary-top-paddingDouwe Maan2017-06-221-2/+1
* | | | | | | | | Fix mobile environment detail viewAnnabel Dunstone Gray2017-06-233-9/+11
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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
* | | | | | | | Fix dropdown position for the new button on mobile for the top navbarJose Ivan Vargas Lopez2017-06-232-0/+6
| |_|_|/ / / / |/| | | | | |
* | | | | | | Resolve ""Add Members" drop-down doesn't separate Name/Username"Tim Zallmann2017-06-221-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | 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 '28717-additional-metrics-review-branch' into 'master'Grzegorz Bizon2017-06-2214-16/+336
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-22212-1694/+1740
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Add rescue_from(ActionController::UnknownFormat) in Application ControllerPawel Chojnacki2017-06-204-12/+20
| * | | | | | Remove unnecessary prometheus_service method, that is now handled by new auto...Pawel Chojnacki2017-06-201-4/+0
| * | | | | | Move Prometheus service to project modelPawel Chojnacki2017-06-165-19/+15
| * | | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-16394-3443/+5656
| |\ \ \ \ \ \
| * | | | | | | Test Additional metrics parser and fix query checking testsPawel Chojnacki2017-06-091-4/+0
| * | | | | | | Fix Additional metrics filteringPawel Chojnacki2017-06-082-2/+5
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-07435-2304/+6159
| |\ \ \ \ \ \ \
| * | | | | | | | Use explicit instance of prometheus service and add access methods to itPawel Chojnacki2017-06-075-23/+32
| * | | | | | | | expand Namespaces:: and refactoring yaml parsing out of MetricGroup classPawel Chojnacki2017-06-061-1/+1
| * | | | | | | | Explicitly require format.json in prometheus_controllerPawel Chojnacki2017-06-062-7/+16
| * | | | | | | | Use `.text-center` class instead of text-align prop28717-fe-prometheus-additional-metricskushalpandya2017-06-022-3/+2
| * | | | | | | | Update as per review feedbackkushalpandya2017-06-015-42/+53
| * | | | | | | | Handle response failure case for loadActiveMetricskushalpandya2017-06-011-2/+5
| * | | | | | | | Changes based on UX reviewkushalpandya2017-06-012-4/+9
| * | | | | | | | Remove service help, add URL field helpkushalpandya2017-06-011-12/+2
| * | | | | | | | Lint: Fix missing new line at EOFkushalpandya2017-05-313-3/+3
| * | | | | | | | Styles for banner within panelkushalpandya2017-05-311-0/+8
| * | | | | | | | Populate Missing env var panelkushalpandya2017-05-312-5/+26
View Lorry Controller Status