summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | 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
* | Limit what label fields we expose on Groups::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+2
* | Limit what label fields we expose on Dashboard::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+3
* | Use present? instead of presence on Projects::MergeRequestsControllerDouglas Barbosa Alexandre2016-10-191-1/+4
* | Reduce duplication between the project and group label formsDouglas Barbosa Alexandre2016-10-191-0/+1
* | Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-191-9/+10
* | Show labels widget on issuable sidebar if project has only group labelsDouglas Barbosa Alexandre2016-10-191-1/+1
* | Avoid an extra a query per label when setting label priorityDouglas Barbosa Alexandre2016-10-191-2/+3
* | List only labels that belongs to the group on the group issues pageDouglas Barbosa Alexandre2016-10-192-7/+10
* | Remove project_labels from Projects::ApplicationControllerDouglas Barbosa Alexandre2016-10-195-22/+22
* | List group labels on project labels pageDouglas Barbosa Alexandre2016-10-195-7/+34
* | 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-194-6/+15
* | Add CRUD for Group LabelsDouglas Barbosa Alexandre2016-10-191-0/+67
* | 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
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-11/+24
| |\ \ | | |/
| * | 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-182-6/+21
| |\ \
| * | | 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-1719-171/+228
| |\ \ \