summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fixed multi-line markdown in issue edit formissue-form-multiple-line-markdownPhil Hughes2017-06-261-2/+2
| | | | Closes #34318
* Merge branch '34289-drop-gfm-on-milestone-issuable-title' into 'master'Sean McGivern2017-06-261-1/+1
|\ | | | | | | | | | | | | Drop GFM support for issuable title on milestone Closes #34289 See merge request !12444
| * Drop GFM support for issuable title on milestone for consistency and performanceTakuya Noguchi2017-06-261-1/+1
| |
* | Merge branch 'sh-revert-annotate-for-blame' into 'master'Rémy Coutable2017-06-263-3/+3
|\ \ | | | | | | | | | | | | Revert "Annotate" to "Blame" See merge request !12401
| * | Revert "Annotate" to "Blame"sh-revert-annotate-for-blameStan Hu2017-06-223-3/+3
| | |
* | | Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-2616-65/+156
|\ \ \ | | | | | | | | | | | | | | | | Add additional user and email services See merge request !12125
| * | | fix spec failuresJames Lopez2017-06-252-4/+4
| | | |
| * | | fix spec failuresJames Lopez2017-06-232-4/+2
| | | |
| * | | update code based on feedbackJames Lopez2017-06-235-10/+7
| | | |
| * | | fix bug in emails destroy serviceJames Lopez2017-06-232-3/+2
| | | |
| * | | fix profiles specJames Lopez2017-06-231-3/+3
| | | |
| * | | refactor update user service not to do auth checksJames Lopez2017-06-2311-34/+27
| | | |
| * | | 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
| | | |
* | | | Merge branch 'fix/gb/fix-skipped-pipeline-with-allowed-to-fail-jobs' into ↵Kamil Trzciński2017-06-261-10/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix pipeline status when allowed to fail jobs present Closes #29059 See merge request !11166
| * | | | 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 form Closes #33758 See merge request !12422
| * | | | | Fixes ctrl+enter not submit issue edit formissue-inline-edit-quick-submitPhil Hughes2017-06-242-2/+4
| | |/ / / | |/| | | | | | | | | | | | | Closes #33758
* | | | | Merge branch 'zj-faster-charts-page' into 'master'Grzegorz Bizon2017-06-266-19/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance for pipeline charts Closes #32407 See merge request !12378
| * | | | | Remove last references to job for pipeline chartszj-faster-charts-pageZ.J. van de Weg2017-06-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not ammended to another commit as it will probably have failing tests which I'll fix and amend to this commit.
| * | | | | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-235-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being the good boyscouts, but mainly because of [the comment in the review](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12378#note_33302115) the words used for classes and variables are changed to not use builds anymore.
| * | | | | Improve performance for pipeline chartsZ.J. van de Weg2017-06-233-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Achieved by using another table, which both has better indexes and is smaller. Now the data provided for the user is more valueable too.
* | | | | | Merge branch 'dm-group-page-name' into 'master'Sean McGivern2017-06-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show group name instead of path on group page See merge request !12391
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform project housekeeping after importing projects Closes #34019 See merge request !12323
| * | | | | | 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
| | | | | | |
View Lorry Controller Status