diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-21 19:56:47 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-21 19:56:47 +0000 |
| commit | 3e3b2fab28af3412032be05252ae7868610346b2 (patch) | |
| tree | 59092580ce31e2b1a0e0952352508b06429fc122 /app | |
| parent | 1a765357801421cffe413c3101d1fcca6da01600 (diff) | |
| parent | 796f4af243cfe30296696142cd0b94e96c3bc398 (diff) | |
| download | gitlab-ce-3e3b2fab28af3412032be05252ae7868610346b2.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/environments/components/environment.js.es6 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6 index 952110744d4..1043e516483 100644 --- 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> |