Merge branch 'fix-folders' into 'master'

Fix permissions error ## What does this MR do? Gives the permissions to the child row in order to render it properly. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7627

Merge branch 'fix-folders' into 'master'
3e3b2fab · Fatih Acet · 1a765357 · 796f4af2 · 3e3b2fab
Commit 3e3b2fab authored Nov 21, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

environment.js.es6 ...ts/javascripts/environments/components/environment.js.es6 +3 -1

No files found.
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -232,7 +232,9 @@
                    is="environment-item"
                    v-for="children in model.children"
                    :model="children"
-                    :toggleRow="toggleRow.bind(children)">
+                    :toggleRow="toggleRow.bind(children)"
+                    :can-create-deployment="canCreateDeploymentParsed"
+                    :can-read-environment="canReadEnvironmentParsed">
                    </tr>

                </template>