summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-072-2/+9
* Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-1/+9
* Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-043-4/+22
|\
| * Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-043-3/+7
| |\
| * \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-028-17/+17
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-261-3/+6
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-253-3/+11
| |\ \ \ \
| * | | | | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-243-4/+22
* | | | | | Merge branch 'rs-merge_request_params' into 'master' Robert Speicher2016-11-041-6/+21
|\ \ \ \ \ \
| * | | | | | Apply `*_params_ce + *_params_ee` pattern to MergeRequestsControllerRobert Speicher2016-11-041-6/+21
* | | | | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-041-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Complete and improve specsRémy Coutable2016-11-041-2/+2
| * | | | | | Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-2/+3
* | | | | | | Merge branch '22588-todos-filter-shows-all-users' into 'master' Sean McGivern2016-11-041-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix: Todos Filter Shows All Users22588-todos-filter-shows-all-usersValery Sizov2016-11-041-1/+5
| |/ / / / /
* | | | | | Only skip group when it's actually a group in the "Share with group" select23961-can-t-share-project-with-groupsRémy Coutable2016-11-041-1/+1
|/ / / / /
* | | | | Allow multiple repository storage shards to be enabled, and automatically rou...Nick Thomas2016-11-041-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'Allow-admin-to-search-for-user-by-secondary-email-address' into...Sean McGivern2016-11-011-1/+1
|\ \ \ \
| * | | | Allow to search for user by secondary email address in the admin interfaceYar2016-11-011-1/+1
| * | | | Rename :name search parameter to :search_query at /admin/usersYar2016-11-011-1/+1
* | | | | Merge branch 'adam-fix-wiki-links-markdown' into 'master' Sean McGivern2016-11-011-1/+2
|\ \ \ \ \
| * | | | | Fix relative links in Markdown wiki when displayed in "Project" tabadam-fix-wiki-links-markdownAdam Niedzielski2016-11-011-1/+2
* | | | | | Merge branch 'refactor_group_members' into 'master' Sean McGivern2016-11-011-10/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Implement CreateMembers service to make controller thinrefactor_group_membersValery Sizov2016-11-011-10/+7
| |/ / / /
* | | | | Remove unnecessary includes(:priorities) on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-311-1/+1
|/ / / /
* | | | Merge branch '22271-drone-tag-pipeline-build' into 'master' Douwe Maan2016-10-311-1/+1
|\ \ \ \
| * | | | Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-1/+1
* | | | | Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master' Sean McGivern2016-10-282-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add "x of y tasks completed" on issuableGuilherme Salazar2016-10-282-2/+2
* | | | | Fixed boards store specissue-board-welcome-cookie-monsterPhil Hughes2016-10-281-2/+1
* | | | | Delete issue board welcome cookie when project is newPhil Hughes2016-10-281-1/+4
|/ / / /
* | | | Refactor JIRA service to use gemDrew Blessing2016-10-261-1/+1
| |_|/ |/| |
* | | Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-265-21/+14
|\ \ \ | | |/ | |/|
| * | Merge branch 'security-fix-leaking-namespace-name' into 'security' Douwe Maan2016-10-241-2/+2
| * | Update project member controller to match recent master logicyesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-successDmitriy Zaporozhets2016-10-241-9/+7
| * | Add parentheses around return redirect_to methodDmitriy Zaporozhets2016-10-242-2/+2
| * | Refactor groups/projects members controllerDmitriy Zaporozhets2016-10-242-9/+11
| * | Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-242-1/+9
| |/
| * Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-201-2/+2
| |\
| | * Fix two CI endpoints for MRs where the source project is deletedNick Thomas2016-10-201-1/+1
| | * Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-1/+1
| * | Merge branch 'remove-unused-code-project-members-controller' into 'master' Dmitriy Zaporozhets2016-10-201-15/+0
| |\ \
| | * | Removed code from project members controllerPhil Hughes2016-10-201-15/+0
| | |/
| * | Merge branch 'refactoring_find_commits_method' into 'master' Sean McGivern2016-10-201-1/+1
| |\ \ | | |/ | |/|
| | * Refactoring find_commits functionalityValery Sizov2016-10-201-1/+1
* | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-199-38/+169
|\ \ \ | |/ /
| * | Disable subscribing to group-level labelsDouglas Barbosa Alexandre2016-10-191-4/+1
| * | Use `includes(:priorities)` on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Abstract LabelPriority away into methods on Label modelDouglas Barbosa Alexandre2016-10-191-8/+6
| * | Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre2016-10-192-5/+4
View Lorry Controller Status