summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* fix specsJames Lopez2017-06-232-4/+4
* more refactoringJames Lopez2017-06-234-9/+9
* add missing action to blockJames Lopez2017-06-231-3/+3
* more refactoring based on feedbackJames Lopez2017-06-238-27/+21
* refactor emails serviceJames Lopez2017-06-234-12/+14
* add missing user updatesJames Lopez2017-06-231-3/+4
* update missing email actionsJames Lopez2017-06-233-3/+3
* fix specsJames Lopez2017-06-232-2/+2
* update to use emails destroy serviceJames Lopez2017-06-234-4/+4
* add create and destroy services for emailsJames Lopez2017-06-233-0/+33
* added service in the rest of controllers and classesJames Lopez2017-06-234-8/+8
* fix api and controller issuesJames Lopez2017-06-231-2/+2
* fix specsJames Lopez2017-06-231-7/+8
* update notification settings, fix api specsJames Lopez2017-06-231-1/+1
* update preferences controllerJames Lopez2017-06-231-1/+3
* updated emails, notifications and passwords controllerJames Lopez2017-06-233-12/+16
* fix profiles controllerJames Lopez2017-06-231-2/+2
* finish off refactoring users controllerJames Lopez2017-06-231-10/+25
* update users controllerJames Lopez2017-06-231-2/+5
* refactor profiles controller and update serviceJames Lopez2017-06-232-11/+12
* update profiles controller to use new serviceJames Lopez2017-06-232-13/+21
* use update service on ldap call and updated specs and serviceJames Lopez2017-06-231-4/+20
* ported EE user service to CEJames Lopez2017-06-231-0/+24
* 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
View Lorry Controller Status