summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Remove instance variable @group multiple assignmentYatish Mehta2016-03-081-1/+1
* | Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-072-0/+5
|\ \
| * | Refactor caching codeJacob Vosmaer2016-03-072-4/+5
| * | Tell clients/proxies to cache raw blob requestsJacob Vosmaer2016-03-032-0/+4
* | | Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-071-4/+0
|\ \ \
| * | | Updates from last code review.issue_13621_2Rubén Dávila2016-03-061-4/+0
* | | | Merge branch 'rs-no-default-credentials' into 'master' Douwe Maan2016-03-042-0/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Allow the initial admin to set a passwordrs-no-default-credentialsRobert Speicher2016-03-042-0/+26
| | |/ | |/|
* | | Merge branch 'fix/sentry-1182' into 'master' Douwe Maan2016-03-041-6/+2
|\ \ \ | |/ / |/| |
| * | In UsersController#calendar_activities, when Date isn't parsable, fallback to...fix/sentry-1182Rémy Coutable2016-03-031-6/+2
* | | Merge remote-tracking branch 'origin/sort-starred-projects'Dmitriy Zaporozhets2016-03-041-1/+1
|\ \ \
| * | | Revert "Revert "Sort starred projects on dashboard based on last activity by ...sort-starred-projectsDmitriy Zaporozhets2016-03-031-1/+1
| | |/ | |/|
* | | Invalidate cache for builds badgeGrzegorz Bizon2016-03-041-0/+13
* | | Don't abuse the flash store for displaying SSH Key form errorsRobert Speicher2016-03-031-2/+3
* | | Remove `Profile::KeysController#new` actionRobert Speicher2016-03-031-4/+0
* | | Fixed failing ssh key testsPhil Hughes2016-03-031-1/+1
* | | SSH keys settingsPhil Hughes2016-03-031-2/+3
* | | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-033-12/+13
|/ /
* | Revert "Sort starred projects on dashboard based on last activity by default"Dmitriy Zaporozhets2016-03-031-1/+1
* | Sort starred projects on dashboard based on last activity by defaultDmitriy Zaporozhets2016-03-031-1/+1
* | Merge branch 'refactor-projects-list' into 'master' Dmitriy Zaporozhets2016-03-031-0/+11
|\ \
| * | Refactor projects listDmitriy Zaporozhets2016-03-031-0/+11
| |/
* | Merge branch 'issue_13648' into 'master' Douwe Maan2016-03-031-8/+1
|\ \ | |/ |/|
| * Add specs to ForksController#index.issue_13648Rubén Dávila2016-03-021-6/+1
View Lorry Controller Status