summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* add "x of y tasks completed" on issuableGuilherme Salazar2016-10-282-2/+2
* Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-263-19/+8
|\
| * 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-241-1/+1
| * Refactor groups/projects members controllerDmitriy Zaporozhets2016-10-241-8/+10
| * Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-241-1/+5
| * 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-196-36/+70
|\ \ \ | |/ /
| * | 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
| * | Add support to group labels prioritization on project levelDouglas Barbosa Alexandre2016-10-191-6/+7
| * | Use present? instead of presence on Projects::IssuesController#indexDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Render all available labels to project on project labels dropdownDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Limit what label fields we expose on Projects::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Use present? instead of presence on Projects::MergeRequestsControllerDouglas Barbosa Alexandre2016-10-191-1/+4
| * | Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-191-9/+10
| * | Avoid an extra a query per label when setting label priorityDouglas Barbosa Alexandre2016-10-191-2/+3
| * | Remove project_labels from Projects::ApplicationControllerDouglas Barbosa Alexandre2016-10-194-22/+17
| * | List group labels on project labels pageDouglas Barbosa Alexandre2016-10-194-6/+15
| * | Allow user to create a board list based on a group labelDouglas Barbosa Alexandre2016-10-191-1/+4
| * | Allow users to apply group labels on Issues/MRsDouglas Barbosa Alexandre2016-10-193-5/+11
| * | Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-191-6/+13
| |\ \ | | |/ | |/|
| | * Extract pipeline vars in merge requests controllerGrzegorz Bizon2016-10-181-5/+13
| | * Use all pipelines variable when creating merge requestGrzegorz Bizon2016-10-181-2/+2
| | * Remove obsolete variable assigned to MR widget viewGrzegorz Bizon2016-10-181-1/+0
| * | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-192-10/+21
| |\ \
| | * | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-181-1/+1
| | * | Add `stop!` to `environment`Kamil Trzcinski2016-10-181-4/+7
| | * | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-5/+15
| | |\ \ | | | |/
| | * | Fix remaining specs failuresKamil Trzcinski2016-10-181-1/+6
| | * | Fix specsKamil Trzcinski2016-10-171-1/+1
| | * | Fix environments specsKamil Trzcinski2016-10-171-2/+3
| | * | Improve after code reviewKamil Trzcinski2016-10-171-6/+5
| | * | Remove destroy from environments [ci skip]Kamil Trzcinski2016-10-171-13/+3
| | * | Refactor code to use available and stopped statuses and refactor views to use...Kamil Trzcinski2016-10-172-4/+6
| | * | Add environment stop action [ci skip]Kamil Trzcinski2016-10-172-1/+6
| | * | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1710-129/+202
| | |\ \
| | * | | Make environments to be close ableKamil Trzcinski2016-10-061-5/+6
| | * | | Adds variables to controllerFilipa Lacerda2016-10-061-0/+5
* | | | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-1910-108/+147
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-181-5/+15
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-173-18/+64
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Allow setting content for resolutionsSean McGivern2016-10-131-5/+15
View Lorry Controller Status