diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-03-02 19:17:25 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-03-02 19:17:25 +0000 |
| commit | a7ff87f459e607a63bfe31845e331d50c92339be (patch) | |
| tree | 4f72eeed489bc90720a329bd1780e8304281cbad | |
| parent | 10e9efcb2c841090ac02c228861ff0b3862c02e5 (diff) | |
| parent | ee886f934481b79f7b41a11f36c224fbe1583788 (diff) | |
| download | gitlab-ce-a7ff87f459e607a63bfe31845e331d50c92339be.tar.gz | |
Merge branch 'backport-ee-changes-environmnets' into 'master'
Backport EE changes. Service method should be `get` and not `all`
See merge request !9672
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6 index 5869323d1e2..277a3acfd3c 100644 --- a/app/assets/javascripts/environments/components/environment.js.es6 +++ b/app/assets/javascripts/environments/components/environment.js.es6 @@ -78,7 +78,7 @@ module.exports = Vue.component('environment-component', { this.isLoading = true; - return service.all() + return service.get() .then(resp => ({ headers: resp.headers, body: resp.json(), diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 index 53d52965758..2a9d0492d7a 100644 --- a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 +++ b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 @@ -92,7 +92,7 @@ module.exports = Vue.component('environment-folder-view', { this.isLoading = true; - return service.all() + return service.get() .then(resp => ({ headers: resp.headers, body: resp.json(), diff --git a/app/assets/javascripts/environments/services/environments_service.js.es6 b/app/assets/javascripts/environments/services/environments_service.js.es6 index 9cef335868e..effc6c4c838 100644 --- a/app/assets/javascripts/environments/services/environments_service.js.es6 +++ b/app/assets/javascripts/environments/services/environments_service.js.es6 @@ -5,7 +5,7 @@ class EnvironmentsService { this.environments = Vue.resource(endpoint); } - all() { + get() { return this.environments.get(); } } |