summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \
| * | | | Make environments to be close ableKamil Trzcinski2016-10-061-5/+6
| * | | | Adds variables to controllerFilipa Lacerda2016-10-061-0/+5
* | | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-182-7/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-182-6/+21
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-174-18/+48
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1413-124/+104
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0813-60/+128
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0424-75/+75
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2112-61/+169
| |\ \ \ \ \ \ \
| * | | | | | | | Make various trace methods take last_lines argument:Lin Jen-Shin2016-09-211-1/+3
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-195-4/+26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-143-14/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1233-190/+211
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Simplify the codeLin Jen-Shin2016-09-011-6/+2
* | | | | | | | | | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-182-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-175-19/+73
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Fix specsSean McGivern2016-10-131-2/+2
| * | | | | | | | | | | Allow setting content for resolutionsSean McGivern2016-10-132-6/+21
* | | | | | | | | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-171-11/+24
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | 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