summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-1/+1
|\
| * Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-157-40/+54
| |\
| * \ Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-146-22/+44
| |\ \
| * | | External UsersZeger-Jan van de Weg2016-03-131-1/+1
* | | | Merge branch 'new-branch-button-issue' into 'master' Douwe Maan2016-03-172-3/+19
|\ \ \ \
| * \ \ \ Merge branch 'master' into new-branch-button-issueZeger-Jan van de Weg2016-03-172-3/+3
| |\ \ \ \
| * | | | | Incorporate reviewZeger-Jan van de Weg2016-03-151-4/+3
| * | | | | Enhance new branch button on an issueZeger-Jan van de Weg2016-03-151-0/+6
| * | | | | new-branch-buttonZeger-Jan van de Weg2016-03-152-3/+14
| | |_|_|/ | |/| | |
* | | | | Reuse `no_cache_headers` method in badges controllerGrzegorz Bizon2016-03-171-12/+1
| |/ / / |/| | |
* | | | Clearify who deletes the userZeger-Jan van de Weg2016-03-151-1/+1
* | | | Fix broken specsZeger-Jan van de Weg2016-03-151-1/+1
* | | | Add ability to delete a user with forceZeger-Jan van de Weg2016-03-151-1/+1
* | | | A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-151-1/+1
|/ / /
* | | Create a SentNotification record for #relabeled_issue_email / #relabeled_merg...Rémy Coutable2016-03-151-0/+17
* | | Move the #toggle_subscription controller method to a concernRémy Coutable2016-03-153-28/+15
* | | Improving the original label-subscribing implementationRémy Coutable2016-03-153-0/+6
* | | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-2/+7
* | | Merge branch 'revert-avatar-cropping' into 'master' Rémy Coutable2016-03-151-3/+0
|\ \ \
| * | | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-151-3/+0
* | | | Merge branch 'application-settings' into 'master' Robert Speicher2016-03-152-17/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settingsRobert Speicher2016-03-132-22/+14
| * | | Fixed Ruby style errorPhil Hughes2016-03-041-1/+1
| * | | Applications tab on profile settingsPhil Hughes2016-03-042-1/+6
* | | | Merge branch 'auto-gc' into 'master' revert-01160fc0Douwe Maan2016-03-151-4/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use an exception to pass messagesJacob Vosmaer2016-03-151-5/+10
| * | | Allow project housekeeping only once an hourJacob Vosmaer2016-03-141-2/+2
* | | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-143-1/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Render project members from shared groupDmitriy Zaporozhets2016-03-121-0/+1
| * | | Add share project from group lockDmitriy Zaporozhets2016-03-111-1/+1
| * | | Show shared projects on group pageDmitriy Zaporozhets2016-03-111-0/+2
| * | | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-111-0/+23
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-143-21/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix denting and specZeger-Jan van de Weg2016-03-131-1/+1
| * | | ContinueToParams -> ContinueParamsZeger-Jan van de Weg2016-03-133-4/+4
| * | | Check redirect path in the continue_paramsZeger-Jan van de Weg2016-03-133-21/+17
* | | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-11/+0
* | | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-0/+11
* | | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-121-11/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove existing go_import.html.haml implementationStan Hu2016-03-121-11/+0
| |/ /
* | | Merge branch 'group-activity-separate-tab' into 'master' Robert Speicher2016-03-111-2/+4
|\ \ \ | |/ / |/| |
| * | Move group activity feed to separate page for consistency with dashboard and ...Dmitriy Zaporozhets2016-03-101-2/+4
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into expirin...Jacob Vosmaer2016-03-102-5/+5
|\ \ \
| * | | Allow filtered dashboard/explore results to be paged. Fixes #14104fix-filtered-paginationJosh Frye2016-03-092-5/+5
| |/ /
* | | Move method to UserJacob Vosmaer2016-03-101-1/+1
* | | Rename ExpiringLock to ExclusiveLeaseJacob Vosmaer2016-03-101-1/+1
* | | Acquire lock before LDAP syncJacob Vosmaer2016-03-091-0/+2
|/ /
* | Merge branch 'improve-archived-projects'Dmitriy Zaporozhets2016-03-094-24/+32
|\ \
| * | Add projects list sort dropdown to group pageDmitriy Zaporozhets2016-03-041-2/+4
| * | Add option to show archived projects on dahsboardDmitriy Zaporozhets2016-03-043-22/+28
View Lorry Controller Status