summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Pinned sidebar navigation optionPhil Hughes2016-06-151-3/+14
* Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-151-1/+1
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-121-1/+1
* | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-152-0/+8
|\ \
| * \ Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-1/+0
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-143-7/+24
| |\ \ \
| * | | | Added initial version of deploymentsKamil Trzcinski2016-06-101-0/+4
| * | | | commit statusKamil Trzcinski2016-06-101-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-142-0/+7
|\ \ \ \
| * | | | Updated TODO descriptionPhil Hughes2016-06-141-1/+1
| * | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-141-10/+0
| * | | | Fixed bug with sidebar when user is not logged inPhil Hughes2016-06-141-1/+3
| * | | | todo title text update for manual todosPhil Hughes2016-06-141-0/+1
| * | | | Manually create todo for issuablePhil Hughes2016-06-141-0/+14
| | |/ / | |/| |
* | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-141-1/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-132-0/+23
| |\ \ \ | | |/ /
| * | | Allow to show the time in the futureKamil Trzcinski2016-06-131-1/+0
* | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-143-115/+92
* | | | Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-141-2/+2
* | | | Add request access for groupsRémy Coutable2016-06-143-44/+119
* | | | Initial implementation of user access request to projectsDavid Alexander2016-06-141-3/+9
| |/ / |/| |
* | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-131-0/+4
|\ \ \
| * | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-131-0/+4
* | | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-131-0/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-15/+2
| * | | Remove notification level from user modelFelipe Artur2016-06-101-0/+32
| |/ /
* | | Add back sidebar counters and usernameAnnabel Dunstone2016-06-101-7/+1
| |/ |/|
* | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-101-0/+24
|\ \
| * \ Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-105-5/+13
| |\ \ | | |/
| * | Add send_git_diff helperDouwe Maan2016-06-085-20/+40
| |\ \
| * | | Add workhorse controller and API helpersDouwe Maan2016-06-061-0/+17
* | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-101-0/+2
|\ \ \ \
| * | | | CI build page UI updatePhil Hughes2016-06-101-0/+2
| | |_|/ | |/| |
* | | | Merge branch 'label-filter-fix' into 'master' Jacob Schatz2016-06-101-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Added testslabel-filter-fixPhil Hughes2016-06-091-2/+2
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltipFatih Acet2016-06-091-3/+3
|\ \ \ \
| * | | | Fixed failing testsPhil Hughes2016-06-091-1/+1
| * | | | Updated labels UIPhil Hughes2016-06-091-3/+3
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-092-1/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-1/+1
| |\ \ \
| | * | | Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-1/+1
| * | | | Merge branch '17240-svg' into 'master' Jacob Schatz2016-06-081-0/+4
| |\ \ \ \
| | * | | | Start adding SVG iconsAnnabel Dunstone2016-06-081-0/+4
| | | |_|/ | | |/| |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-091-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Allow custom text on 'almost there' pageSean McGivern2016-06-081-0/+4
| |/ / /
* | | | Fixes for MR comments.Fatih Acet2016-06-091-1/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-084-19/+32
|\ \ \ \ | |/ / /
| * | | Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz2016-06-071-3/+19
| |\ \ \
| | * | | Notifications dropdown on project page now has descriptionsPhil Hughes2016-06-071-3/+19
| * | | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-1/+10
| |\ \ \ \ | | |/ / / | |/| | |