summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Use deployment IID when saving refsZ.J. van de Weg2016-10-202-3/+3
* Merge branch 'sh-improve-merge-service-logging' into 'master' Robert Speicher2016-10-191-4/+16
|\
| * Identify merge request project and IID in log messagesh-improve-merge-service-loggingStan Hu2016-10-181-1/+7
| * Improve error logging of MergeServiceStan Hu2016-10-181-4/+10
* | Merge branch 'sh-fix-broken-note-award-emoji' into 'master' Robert Speicher2016-10-191-1/+1
|\ \
| * | Fix broken award emoji for commentsStan Hu2016-10-181-1/+1
* | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-1917-52/+161
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1817-180/+301
| |\ \
| * | | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-181-1/+1
| * | | Add `stop!` to `environment`Kamil Trzcinski2016-10-182-4/+13
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1829-533/+907
| |\ \ \
| * | | | Fix remaining specs failuresKamil Trzcinski2016-10-183-3/+8
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dy...Kamil Trzcinski2016-10-1713-139/+231
| |\ \ \ \
| * | | | | Updates class name for consistencyFilipa Lacerda2016-10-174-7/+7
| * | | | | Fix specsKamil Trzcinski2016-10-171-1/+1
| * | | | | Fix environments specsKamil Trzcinski2016-10-176-10/+12
| * | | | | Work on specsKamil Trzcinski2016-10-171-2/+2
| * | | | | Improve after code reviewKamil Trzcinski2016-10-178-21/+22
| * | | | | Remove destroy from environments [ci skip]Kamil Trzcinski2016-10-171-13/+3
| * | | | | Add on_stop column [ci skip]Kamil Trzcinski2016-10-171-2/+0
| * | | | | Merge branch '22191-delete-dynamic-envs-mr' of gitlab.com:gitlab-org/gitlab-c...Kamil Trzcinski2016-10-171-0/+11
| |\ \ \ \ \
| | * | | | | Renames button to show 'Stop' instead of 'Close'Filipa Lacerda2016-10-171-1/+1
| | * | | | | Updates MR template to include stop linkFilipa Lacerda2016-10-171-0/+11
| * | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-171-0/+13
| |\ \ \ \ \ \
| * | | | | | | Save `on_stop` in deploymentKamil Trzcinski2016-10-171-1/+2
| * | | | | | | Add `action` and `on_stop` to `environment` in .gitlab-ci.ymlKamil Trzcinski2016-10-171-13/+9
| * | | | | | | Refactor code to use available and stopped statuses and refactor views to use...Kamil Trzcinski2016-10-1715-81/+78
| | |/ / / / / | |/| | | | |
| * | | | | | Add environment stop action [ci skip]Kamil Trzcinski2016-10-173-11/+6
| * | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-17351-1964/+4360
| |\ \ \ \ \ \
| * | | | | | | Allow to close environmentsKamil Trzcinski2016-10-063-6/+4
| * | | | | | | Make environments to be close ableKamil Trzcinski2016-10-067-30/+37
| * | | | | | | Add play typeKamil Trzcinski2016-10-061-1/+15
| * | | | | | | Initial support for closing environmentsKamil Trzcinski2016-10-064-1/+46
| * | | | | | | Fixes space between buttonsFilipa Lacerda2016-10-061-1/+1
| * | | | | | | Adds close button to builds listFilipa Lacerda2016-10-064-8/+6
| * | | | | | | Replaces destroy button with close oneFilipa Lacerda2016-10-061-1/+2
| * | | | | | | Adds stop environment button to environments listFilipa Lacerda2016-10-064-3/+17
| * | | | | | | Adds tabs to environments listFilipa Lacerda2016-10-061-0/+13
| * | | | | | | Adds variables to controllerFilipa Lacerda2016-10-061-0/+5
| * | | | | | | Adds new line in the end of the fileFilipa Lacerda2016-10-061-1/+1
| * | | | | | | Adds link to close environment in a merge requestFilipa Lacerda2016-10-062-0/+12
* | | | | | | | Use Hash rocket syntax to maintain Ruby 2.1 compatibilityStan Hu2016-10-181-2/+2
* | | | | | | | Fix visual weirdness in pipelinesAnnabel Dunstone Gray2016-10-181-2/+1
* | | | | | | | Use Hash rocket syntax to maintain Ruby 2.1 compatibilityStan Hu2016-10-181-2/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fix missing semicolon to make scss-lint happyfix-scss-lint-pipelinesStan Hu2016-10-181-1/+1
* | | | | | | Merge branch '19991-triggered-pipeline' into 'master' Jacob Schatz2016-10-186-44/+58
|\ \ \ \ \ \ \
| * | | | | | | Add API as trigger19991-triggered-pipelineAnnabel Dunstone Gray2016-10-172-0/+6
| * | | | | | | Trigger updatesAnnabel Dunstone Gray2016-10-104-6/+12
| * | | | | | | Fix icon alignmentAnnabel Dunstone Gray2016-10-102-1/+6
| * | | | | | | Add separate pipeline and commit columnsAnnabel Dunstone Gray2016-10-104-44/+41
View Lorry Controller Status