-
- Downloads
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 Former-commit-id: b9c2fb88
No related branches found
No related tags found
Showing
- app/assets/javascripts/environments/components/environment.js.es6 248 additions, 0 deletions...ts/javascripts/environments/components/environment.js.es6
- app/assets/javascripts/environments/components/environment_actions.js.es6 67 additions, 0 deletions...cripts/environments/components/environment_actions.js.es6
- app/assets/javascripts/environments/components/environment_external_url.js.es6 22 additions, 0 deletions...s/environments/components/environment_external_url.js.es6
- app/assets/javascripts/environments/components/environment_item.js.es6 494 additions, 0 deletions...vascripts/environments/components/environment_item.js.es6
- app/assets/javascripts/environments/components/environment_rollback.js.es6 31 additions, 0 deletions...ripts/environments/components/environment_rollback.js.es6
- app/assets/javascripts/environments/components/environment_stop.js.es6 27 additions, 0 deletions...vascripts/environments/components/environment_stop.js.es6
- app/assets/javascripts/environments/environments_bundle.js.es6 21 additions, 0 deletions...ssets/javascripts/environments/environments_bundle.js.es6
- app/assets/javascripts/environments/services/environments_service.js.es6 22 additions, 0 deletions...scripts/environments/services/environments_service.js.es6
- app/assets/javascripts/environments/stores/environments_store.js.es6 131 additions, 0 deletions...javascripts/environments/stores/environments_store.js.es6
- app/assets/javascripts/environments/vue_resource_interceptor.js.es6 12 additions, 0 deletions.../javascripts/environments/vue_resource_interceptor.js.es6
- app/assets/javascripts/lib/utils/text_utility.js 3 additions, 0 deletionsapp/assets/javascripts/lib/utils/text_utility.js
- app/assets/javascripts/vue_common_component/commit.js.es6 176 additions, 0 deletionsapp/assets/javascripts/vue_common_component/commit.js.es6
- app/assets/stylesheets/pages/environments.scss 40 additions, 3 deletionsapp/assets/stylesheets/pages/environments.scss
- app/controllers/projects/environments_controller.rb 9 additions, 6 deletionsapp/controllers/projects/environments_controller.rb
- app/helpers/environments_helper.rb 7 additions, 0 deletionsapp/helpers/environments_helper.rb
- app/serializers/build_entity.rb 8 additions, 8 deletionsapp/serializers/build_entity.rb
- app/serializers/commit_entity.rb 7 additions, 0 deletionsapp/serializers/commit_entity.rb
- app/serializers/deployment_entity.rb 2 additions, 2 deletionsapp/serializers/deployment_entity.rb
- app/serializers/environment_entity.rb 9 additions, 2 deletionsapp/serializers/environment_entity.rb
- app/views/projects/environments/_environment.html.haml 0 additions, 35 deletionsapp/views/projects/environments/_environment.html.haml
app/helpers/environments_helper.rb
0 → 100644
Please register or sign in to comment