kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve 500 error

This commit is contained in:
Filipa Lacerda 2017-02-09 11:16:11 +00:00
parent 72f76c4d49
commit acb68ae69e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
View File

@ -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);
}

1
app/controllers/projects/environments_controller.rb
View File

@ -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|