summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Suppress update events on pipeline if already they got scheduledsuppress-update-events-on-pipelineKamil Trzcinski2016-10-193-10/+32
|
* Merge branch 'sh-improve-merge-service-logging' into 'master' Robert Speicher2016-10-192-6/+18
|\ | | | | | | | | | | | | Improve error logging of MergeService Relates to #23505 See merge request !6975
| * 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-182-6/+12
| | | | | | | | Relates to #23505
* | Merge branch 'sh-fix-broken-note-award-emoji' into 'master' Robert Speicher2016-10-192-6/+42
|\ \ | | | | | | | | | | | | | | | | | | Fix broken award emoji for comments Closes #23506 See merge request !6967
| * | Add spec for toggling award emoji on issue notessh-fix-broken-note-award-emojiStan Hu2016-10-181-5/+41
| | |
| * | Fix broken award emoji for commentsStan Hu2016-10-181-1/+1
| | | | | | | | | | | | Closes #23506
* | | Merge branch 'backport-git-access-spec-changes' into 'master' Douwe Maan2016-10-191-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport git access spec changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645#note_16391185 See merge request !6961
| * | | Backport git access spec changes from EEbackport-git-access-spec-changesSean McGivern2016-10-181-6/+6
| | | | | | | | | | | | | | | | | | | | These were introduced in: <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645>
* | | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-1933-102/+657
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete dynamic environments - Adds "close environment" action to a merge request - Adds tabs to environments list - Adds close button to each environment row in environments list - Replaces Destroy button with Close button inside an environment - Adds close button to builds list inside an environment #### Configuration In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App when: manual environment: name: review/$app action: stop ``` This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined. The next MR after this one will verify that and enforce that these settings are configured. It will also implicitly configure these settings, making it possible to define it like this: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App ``` Closes #22191 See merge request !6669
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1838-218/+506
| |\ \ \
| * | | | Merge two scenarios into oneKamil Trzcinski2016-10-181-8/+2
| | | | |
| * | | | Fix remaining offensesKamil Trzcinski2016-10-182-4/+5
| | | | |
| * | | | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-183-1/+77
| | | | |
| * | | | Add `stop!` to `environment`Kamil Trzcinski2016-10-183-4/+50
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1845-587/+1561
| |\ \ \ \
| * | | | | Fix remaining specs failuresKamil Trzcinski2016-10-184-7/+14
| | | | | |
| * | | | | Merge branch '22191-delete-dynamic-envs-mr' of ↵Kamil Trzcinski2016-10-170-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dynamic-envs-mr
| | * | | | | Fixes broken testFilipa Lacerda2016-10-171-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-10-1738-265/+461
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 22191-delete-dynamic-envs-mr
| * | | | | | | 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 ↵Kamil Trzcinski2016-10-171-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dynamic-envs-mr
| | * | | | | | 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 ↵Kamil Trzcinski2016-10-171-0/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dynamic-envs-mr
| | * | | | | | 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
| |\ \ \ \ \ \ \
| * | | | | | | | 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 ↵Kamil Trzcinski2016-10-1719-94/+111
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | use separate renders
| * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Allow to close environmentsKamil Trzcinski2016-10-065-8/+8
| | | | | | | | |
| * | | | | | | | Make environments to be close ableKamil Trzcinski2016-10-068-32/+45
| | | | | | | | |
| * | | | | | | | Add play typeKamil Trzcinski2016-10-061-1/+15
| | | | | | | | |
View Lorry Controller Status