summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix specsKamil Trzcinski2016-10-174-12/+12
* Fixes typoFilipa Lacerda2016-10-171-1/+1
* Updates class name for consistencyFilipa Lacerda2016-10-175-11/+11
* Fix specsKamil Trzcinski2016-10-174-57/+43
* Fix environments specsKamil Trzcinski2016-10-178-32/+74
* Work on specsKamil Trzcinski2016-10-174-3/+140
* Add specs to test on_stop and action on environmentsKamil Trzcinski2016-10-172-2/+6
* Merge branch '22191-delete-dynamic-envs-mr' of gitlab.com:gitlab-org/gitlab-c...Kamil Trzcinski2016-10-171-0/+1
|\
| * Changes after reviewFilipa Lacerda2016-10-173-5/+5
| * Adds entry to CHANGELOGFilipa Lacerda2016-10-171-0/+1
| * Updates close to say stop in confirm messageFilipa Lacerda2016-10-171-1/+1
* | Improve after code reviewKamil Trzcinski2016-10-1710-23/+86
|/
* Remove destroy from environments [ci skip]Kamil Trzcinski2016-10-172-14/+4
* Add on_stop column [ci skip]Kamil Trzcinski2016-10-173-24/+2
* 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
* | Update `db/schema.rb`Kamil Trzcinski2016-10-171-1/+2
* | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-178-9/+46
|\ \
| * \ Merge branch 'ebraminio/gitlab-ce-master' into 'master'Robert Speicher2016-10-178-9/+46
| |\ \
| | * | Add RTL support to markdown rendererEbrahim Byagowi2016-10-168-9/+46
* | | | Save `on_stop` in deploymentKamil Trzcinski2016-10-171-1/+2
* | | | Add `action` and `on_stop` to `environment` in .gitlab-ci.ymlKamil Trzcinski2016-10-172-16/+20
* | | | Refactor code to use available and stopped statuses and refactor views to use...Kamil Trzcinski2016-10-1719-94/+111
| |_|/ |/| |
* | | Merge commit '7d12683' into 22191-delete-dynamic-envs-mr [ci skip]Kamil Trzcinski2016-10-172-3/+68
|\ \ \
| * | | Fixes broken testsFilipa Lacerda2016-10-112-3/+53
| * | | Adds tests to verify if tabs are renderedFilipa Lacerda2016-10-101-0/+15
* | | | Add environment stop action [ci skip]Kamil Trzcinski2016-10-174-12/+11
* | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-17760-6592/+14985
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'fix-trending-projects-spinach-failure' into 'master' Dmitriy Zaporozhets2016-10-172-0/+5
| |\ \
| | * | Fix trending projects Spinach failurefix-trending-projects-spinach-failureStan Hu2016-10-142-0/+5
| * | | Merge branch 'fix-compare-spec' into 'master' Stan Hu2016-10-171-1/+1
| |\ \ \
| | * | | Fix broken rspec in compare textStan Hu2016-10-161-1/+1
| |/ / /
| * | | Merge branch 'fix-spinach-compare-tests' into 'master' Stan Hu2016-10-174-10/+33
| |\ \ \
| | * | | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-163-8/+23
| | * | | Fix broken Spinach tests caused by changes in !6550Stan Hu2016-10-162-7/+15
| |/ / /
| * | | Merge branch 'dz-fix-branches-tab-test' into 'master' Dmitriy Zaporozhets2016-10-161-1/+1
| |\ \ \
| | * | | Fix active tab test for branches pagedz-fix-branches-tab-testDmitriy Zaporozhets2016-10-161-1/+1
| * | | | Merge branch 'fix-merge-request-diff-spinach-failures' into 'master' Dmitriy Zaporozhets2016-10-163-4/+12
| |\ \ \ \
| | * | | | Fix merge requests feature testsfix-merge-request-diff-spinach-failuresDmitriy Zaporozhets2016-10-161-1/+5
| | * | | | Wait for ajax call in merge request unsubscribe testDmitriy Zaporozhets2016-10-161-0/+2
| | * | | | Fix Spinach merge request diff failuresStan Hu2016-10-152-3/+5
| * | | | | Merge branch 'rs-changelog-markdown' into 'master' Robert Speicher2016-10-165-137/+267
| |\ \ \ \ \
| | * | | | | Convert CHANGELOG to MarkdownRobert Speicher2016-10-165-137/+267
| |/ / / / /
| * | | | | Merge branch 'docs/change-docs-reviewers' into 'master' Achilleas Pipinellis2016-10-161-5/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'master' into 'docs/change-docs-reviewers'Achilleas Pipinellis2016-10-16225-1311/+3428
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'dz-fix-group-milestone-creation' into 'master' Dmitriy Zaporozhets2016-10-161-4/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix 500 error when creating mileston from group pagedz-fix-group-milestone-creationDmitriy Zaporozhets2016-10-161-4/+5
| |/ / / /
| * | | | Merge branch 'dz-fix-group-with-dot' into 'master' Dmitriy Zaporozhets2016-10-162-1/+10
| |\ \ \ \
| | * | | | Fix 404 when group path has dot in the namedz-fix-group-with-dotDmitriy Zaporozhets2016-10-162-1/+10
| |/ / / /
View Lorry Controller Status