Commit 18a9151b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 332a17cf ac8f1ba8
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
&.affix { &.affix {
position: fixed; position: fixed;
top: 70px; top: 70px;
width: 220px; margin-right: 35px;
} }
} }
} }
......
...@@ -19,7 +19,7 @@ module API ...@@ -19,7 +19,7 @@ module API
message << " " << trace.join("\n ") message << " " << trace.join("\n ")
API.logger.add Logger::FATAL, message API.logger.add Logger::FATAL, message
rack_response({ 'message' => '500 Internal Server Error' }, 500) rack_response({ 'message' => '500 Internal Server Error' }.to_json, 500)
end end
format :json format :json
......
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