summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceJacob Schatz2016-10-151-0/+4
| |\
| | * Handle unmatched routing with not_found methodDmitriy Zaporozhets2016-10-151-0/+4
| * | Add exists to users routes and fix endpoint.Bryce Johnson2016-10-151-1/+1
| * | Attempt to fix username validation ruby.Bryce Johnson2016-10-151-1/+1
| * | Stringify username before passing to ActiveRecord.Bryce Johnson2016-10-151-1/+1
| * | Make UX upgrades to SignIn/Register views.Bryce Johnson2016-10-151-1/+5
| |/
| * Merge branch 'members-ui' into 'master' Fatih Acet2016-10-142-17/+39
| |\
| | * Changed how collections are renderedPhil Hughes2016-10-061-15/+0
| | * Merge branch 'master' into members-uiPhil Hughes2016-10-069-51/+92
| | |\
| | * | Updated Ruby variable namePhil Hughes2016-10-051-5/+3
| | * | Updated RubyPhil Hughes2016-10-042-3/+4
| | * | Merge branch 'master' into members-uiPhil Hughes2016-10-0427-110/+234
| | |\ \
| | * | | Group links search test fixPhil Hughes2016-09-131-0/+4
| | * | | Added back orderingPhil Hughes2016-09-131-0/+1
| | * | | Ruby updatePhil Hughes2016-09-131-7/+7
| | * | | Removed group members from the list for nowPhil Hughes2016-09-131-25/+0
| | * | | Fixed bug when group_ids not present when creatingPhil Hughes2016-09-131-9/+11
| | * | | Search project groupsPhil Hughes2016-09-131-8/+41
| | * | | Fixed removing groupsPhil Hughes2016-09-131-1/+6
| | * | | Added test for updating groups permissionsPhil Hughes2016-09-131-1/+1
| | * | | Fixed error when updating groupsPhil Hughes2016-09-131-1/+1
| | * | | Updated some specsPhil Hughes2016-09-131-10/+9
| | * | | Fixed searchPhil Hughes2016-09-131-6/+15
| | * | | Fixed issue with invited users not showing upPhil Hughes2016-09-131-1/+13
| | * | | Fixed members errorPhil Hughes2016-09-131-1/+1
| | * | | Return 403 if user can't update groupPhil Hughes2016-09-131-0/+1
| | * | | Removes row from dom when deletingPhil Hughes2016-09-131-5/+2
| | * | | Fixed group members not deletingPhil Hughes2016-09-131-4/+5
| | * | | Fixed issue with groups not displayingPhil Hughes2016-09-131-14/+0
| | * | | Included groups on project_members pagePhil Hughes2016-09-132-0/+13
| * | | | Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-141-1/+2
| * | | | Minor style improvementZ.J. van de Weg2016-10-141-14/+6
| * | | | Rename method in testZ.J. van de Weg2016-10-141-18/+23
| * | | | Moved ci_status environments logic to new action ci_envrionments_status and s...Luke Bennett2016-10-141-18/+20
| * | | | Refactor ci_status on MergeRequestControllerZ.J. van de Weg2016-10-141-25/+20
| * | | | Show what time ago a MR was deployedZ.J. van de Weg2016-10-141-1/+30
| * | | | Merge branch 'use-language-colours-for-graph' into 'master' Sean McGivern2016-10-131-3/+3
| |\ \ \ \
| | * | | | Use Linguist::Language[] instead of creating a hashGeorg G2016-10-101-5/+1
| | * | | | Use defined colour for a language when availableGeorg G2016-10-071-3/+7
| * | | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-134-81/+39
| |\ \ \ \ \
| | * | | | | Fix board relates specsDouglas Barbosa Alexandre2016-10-111-1/+1
| | * | | | | Refactoring service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-111-3/+2
| | * | | | | Remove unused Projects::BoardListsController controllerDouglas Barbosa Alexandre2016-10-111-65/+0
View Lorry Controller Status