summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-wip' into 'master' Jacob Schatz2016-03-191-2/+9
|\
| * Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-1841-180/+430
| |\
| * | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-261-2/+9
* | | Merge branch 'fix/gitlab-omniauth-issue' into 'master' Douwe Maan2016-03-191-0/+1
|\ \ \ | |_|/ |/| |
| * | another attempt to fix oauth issueJames Lopez2016-02-191-1/+1
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/gitlab-omni...James Lopez2016-02-194-7/+15
| |\ \
| * | | attempting to fix omniauth problemJames Lopez2016-02-181-0/+1
* | | | Dedupe labels in labels selector in Dashboard pagesfix/14418Rémy Coutable2016-03-181-2/+9
* | | | Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' Douwe Maan2016-03-181-2/+2
|\ \ \ \
| * | | | Use todo.done without ! in the controller to mark todo as doneDouglas Barbosa Alexandre2016-03-181-2/+2
* | | | | Fixed failing testsPhil Hughes2016-03-181-1/+1
* | | | | Updated controller with before_actionPhil Hughes2016-03-182-7/+5
* | | | | Fixes issue on dashboard issuesPhil Hughes2016-03-181-0/+18
* | | | | Full labels data in JSONPhil Hughes2016-03-181-1/+1
* | | | | Fixed issue with labels dropdown getting wrong labelsPhil Hughes2016-03-182-0/+15
|/ / / /
* | | | Merge branch 'confidential-issues' into 'master' Douwe Maan2016-03-182-3/+7
|\ \ \ \
| * | | | Restrict access for confidential issues on autocompleteDouglas Barbosa Alexandre2016-03-171-1/+1
| * | | | Restrict access to confidential issuesDouglas Barbosa Alexandre2016-03-171-1/+5
| * | | | Add an option to user make an issue confidentialDouglas Barbosa Alexandre2016-03-171-1/+1
* | | | | Merge branch 'optimistic-todos' into 'master' Jacob Schatz2016-03-181-2/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Mark all as done through AJAXPhil Hughes2016-03-171-0/+4
| * | | | Removed the flash success messagePhil Hughes2016-03-171-2/+2
| * | | | Adds small AJAX optimistic functionality to todos.Jacob Schatz2016-03-171-1/+6
* | | | | 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