diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-09 11:16:11 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-09 11:16:31 +0000 |
| commit | acb68ae69e382a7bd949386f14d2d27f6cada086 (patch) | |
| tree | 2a243ad89cccd0acb00ee3742ab8733c347d43f1 | |
| parent | 72f76c4d4981b14d1cc721b1f379832f74a509f8 (diff) | |
| download | gitlab-ce-acb68ae69e382a7bd949386f14d2d27f6cada086.tar.gz | |
Resolve 500 error
| -rw-r--r-- | app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6 | 2 | ||||
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6 b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6 index d3229f9f730..a575ae3e441 100644 --- a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6 +++ b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6 @@ -6,7 +6,7 @@ Vue.http.interceptors.push((request, next) => { Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1; next((response) => { - if (typeof response.data === 'string') { + if (typeof response.data === 'string' && response.status !== 500) { response.data = JSON.parse(response.data); } diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 34b081b3e41..2252ece68ce 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -10,7 +10,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController def index @environments = project.environments - .includes(:last_deployment) .with_state(params[:scope] || :available) respond_to do |format| |