Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
acb68ae6
Commit
acb68ae6
authored
Feb 09, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve 500 error
parent
72f76c4d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
...ts/javascripts/vue_shared/vue_resource_interceptor.js.es6
+1
-1
app/controllers/projects/environments_controller.rb
app/controllers/projects/environments_controller.rb
+0
-1
No files found.
app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
View file @
acb68ae6
...
@@ -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
View file @
acb68ae6
...
@@ -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
|
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment