summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix/gb/fix-skipped-pipeline-with-allowed-to-fail-jobs' into 'ma...Kamil TrzciƄski2017-06-261-10/+13
|\ \ \ \ \ \ \
| * | | | | | | Check warnings when building compound status SQL queryGrzegorz Bizon2017-06-202-16/+13
| * | | | | | | Move custom compound status method to commit statusGrzegorz Bizon2017-06-202-3/+7
| * | | | | | | Fix pipeline status when allowed to fail jobs presentGrzegorz Bizon2017-06-201-1/+3
* | | | | | | | Merge branch 'issue-inline-edit-quick-submit' into 'master'Filipa Lacerda2017-06-262-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes ctrl+enter not submit issue edit formissue-inline-edit-quick-submitPhil Hughes2017-06-242-2/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'zj-faster-charts-page' into 'master'Grzegorz Bizon2017-06-266-19/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove last references to job for pipeline chartszj-faster-charts-pageZ.J. van de Weg2017-06-261-3/+3
| * | | | | | | | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-235-8/+8
| * | | | | | | | Improve performance for pipeline chartsZ.J. van de Weg2017-06-233-14/+12
* | | | | | | | | Merge branch 'dm-group-page-name' into 'master'Sean McGivern2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Show group name instead of path on group pagedm-group-page-nameDouwe Maan2017-06-231-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-34019' into 'master'Sean McGivern2017-06-261-1/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check if repository exists before performing housekeepingfix-34019Douglas Barbosa Alexandre2017-06-231-0/+2
| * | | | | | | | | Break Project#perform_housekeeping in two methodsDouglas Barbosa Alexandre2017-06-231-4/+12
| * | | | | | | | | Perform project housekeeping after importing projectsDouglas Barbosa Alexandre2017-06-231-3/+8
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '33223-multiple-tooltips-on-the-same-vue-component' into 'master'Phil Hughes2017-06-2623-110/+142
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Add support for multiple tooltips in the same Vue componentEric Eastwood2017-06-2323-110/+142
* | | | | | | | | 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