summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-03-02 17:36:30 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-03-02 17:36:30 +0000
commitee886f934481b79f7b41a11f36c224fbe1583788 (patch)
treeb6c1e145dd956a5445145e03989eb7f03bd7fc01 /app/assets/javascripts
parent8ec8b2da66c27124cf049ca77472f5aabc77b759 (diff)
downloadgitlab-ce-ee886f934481b79f7b41a11f36c224fbe1583788.tar.gz
Backport EE changes. Service method should be `get` and not `all`
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/environments/components/environment.js.es62
-rw-r--r--app/assets/javascripts/environments/folder/environments_folder_view.js.es62
-rw-r--r--app/assets/javascripts/environments/services/environments_service.js.es62
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();
}
}