BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit acb68ae6 by Filipa Lacerda
Options

Resolve 500 error

parent 72f76c4d
Showing with 1 addition and 2 deletions
app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
...@@ -6,7 +6,7 @@ Vue.http.interceptors.push((request, next) => { ...@@ -6,7 +6,7 @@ Vue.http.interceptors.push((request, next) => {
Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1; Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1;
next((response) => { next((response) => {
if (typeof response.data === 'string') { if (typeof response.data === 'string' && response.status !== 500) {
response.data = JSON.parse(response.data); response.data = JSON.parse(response.data);
} }
......
app/controllers/projects/environments_controller.rb
...@@ -10,7 +10,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -10,7 +10,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
def index def index
@environments = project.environments @environments = project.environments
.includes(:last_deployment)
.with_state(params[:scope] || :available) .with_state(params[:scope] || :available)
respond_to do |format| respond_to do |format|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment