diff options
| author | Kamil Trzciński <kamil@gitlab.com> | 2017-08-21 15:46:45 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-09-07 20:22:16 -0400 |
| commit | 4efd18d7e140bf2b6b95637af630e7294fcf28cc (patch) | |
| tree | 107d92596480763bb1bd43ee85c6493ca18842a9 /app/assets/javascripts/environments/components/environment_item.vue | |
| parent | 4acab552be05e2ee1ccb6ba1997b770dd89c42bd (diff) | |
| download | gitlab-ce-4efd18d7e140bf2b6b95637af630e7294fcf28cc.tar.gz | |
Merge branch '29943-environment-folder' into 'security-9-5'
Do not use `location.pathname` when accessing environments folders
See merge request !2147
Diffstat (limited to 'app/assets/javascripts/environments/components/environment_item.vue')
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_item.vue | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index d8b1b2f1b92..6de01fa53d0 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -410,20 +410,11 @@ export default { this.hasStopAction || this.canRetry; }, - - /** - * Constructs folder URL based on the current location and the folder id. - * - * @return {String} - */ - folderUrl() { - return `${window.location.pathname}/folders/${this.model.folderName}`; - }, }, methods: { onClickFolder() { - eventHub.$emit('toggleFolder', this.model, this.folderUrl); + eventHub.$emit('toggleFolder', this.model); }, }, }; |