diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-19 17:46:10 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-19 17:46:10 +0000 |
| commit | b9c2fb881027cfad8885e3fdb6a88dc2f2dff942 (patch) | |
| tree | 21ae83486eca500d32639d8c04888783e1f37a0c /changelogs | |
| parent | cf0283c8935986c7182e3b22610eba4f0fb485a1 (diff) | |
| parent | 531d4e564b8417db672b096755a54f909ee7af76 (diff) | |
| download | gitlab-ce-b9c2fb881027cfad8885e3fdb6a88dc2f2dff942.tar.gz | |
Merge branch '22539-display-folders' into 'master'
Resolve "Display "folders" for environments"
## What does this MR do?
Adds the ability to show the grouped environments inside "folders".
Adds several reusable vue components in order to accomplish the recursive tree data structure presented.
For the individual components, Jasmine tests were added.
For the ones that depend of an API response, rspec tests are used.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22539
See merge request !7015
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/22539-display-folders.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/22539-display-folders.yml b/changelogs/unreleased/22539-display-folders.yml new file mode 100644 index 00000000000..d46cdedf7a7 --- /dev/null +++ b/changelogs/unreleased/22539-display-folders.yml @@ -0,0 +1,4 @@ +--- +title: Display "folders" for environments +merge_request: 7015 +author: |