summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13261
* | | | | | | | Improve group visibility level featureZeger-Jan van de Weg2016-03-182-12/+1
| | | | | | | |
* | | | | | | | Code fixesFelipe Artur2016-03-171-2/+2
| | | | | | | |
* | | | | | | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-1617-81/+110
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-157-40/+54
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Create a SentNotification record for #relabeled_issue_email / ↵Rémy Coutable2016-03-151-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #relabeled_merge_request_email
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
| | * | | | | | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
| | * | | | | | Merge branch 'revert-avatar-cropping' into 'master' Rémy Coutable2016-03-151-3/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the avatar cropping feature Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping See merge request !3223
| | | * | | | | | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
| | * | | | | | | Merge branch 'application-settings' into 'master' Robert Speicher2016-03-152-17/+14
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications tab on profile settings Closes #13855 See merge request !3031
| | | * | | | | | Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settingsRobert Speicher2016-03-132-22/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were doing all of kinds of code gymnastics and flash abuse in order to work with a Doorkeeper controller but have it _appear_ at the `/profile/applications` path. Fortunately we can just tell Rails to use a different controller to handle that route, and we get the best of both worlds.
| | | * | | | | | Fixed Ruby style errorPhil Hughes2016-03-041-1/+1
| | | | | | | | |
| | | * | | | | | Applications tab on profile settingsPhil Hughes2016-03-042-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13855
| | * | | | | | | Merge branch 'auto-gc' into 'master' revert-01160fc0Douwe Maan2016-03-151-4/+9
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run 'git gc' every 10 pushes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14250 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12620 Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/254 Associated gitlab-shell MR: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/44 See merge request !3206
| | | * | | | | | 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 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-146-22/+44
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-143-1/+27
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
| | | * | | | | | Render project members from shared groupDmitriy Zaporozhets2016-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | | | | Add share project from group lockDmitriy Zaporozhets2016-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | | | | Show shared projects on group pageDmitriy Zaporozhets2016-03-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | | | | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-111-0/+23
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2649 https://gitlab.com/gitlab-org/gitlab-ce/issues/13956
| * | | | | | | | External UsersZeger-Jan van de Weg2016-03-131-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
| * | | | | | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
| * | | | | | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !3191
| * | | | | | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-121-11/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191
| | * | | | | | 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 project pages Fixes #14161. Part of #13480 See merge request !3157
| | * | | | | Move group activity feed to separate page for consistency with dashboard and ↵Dmitriy Zaporozhets2016-03-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-03-102-5/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | expiring-lock
| | * | | | | | 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
| |/ / / / /
* | | | | | Code improvements and add Create group serviceFelipe Artur2016-03-162-11/+2
| | | | | |
* | | | | | Prevent projects to have higher visibility than groupsFelipe Artur2016-03-104-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Groups to have smaller visibility than projects Add default_group_visibility_level to configuration Code improvements
* | | | | | Code improvementsFelipe Artur2016-03-102-2/+12
| | | | | |
* | | | | | Add permission level to groupsFelipe Artur2016-03-102-2/+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
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add option to show archived projects on dahsboardDmitriy Zaporozhets2016-03-043-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Remove instance variable @group multiple assignmentYatish Mehta2016-03-081-1/+1
| | | | | |
* | | | | | Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-072-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set cache headers for raw blobs This changes allows browsers and (in the case of public projects) proxy caches to cache raw Git blob responses. See merge request !3113