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

app/assets/stylesheets/pages/issuable.scss

@@ -19,7 +19,7 @@
     &.affix {
       position: fixed;
       top: 70px;
-      width: 220px;
+      margin-right: 35px;
     }
   }
 }

lib/api/api.rb

@@ -19,7 +19,7 @@ module API
       message << "  " << trace.join("\n  ")
 
       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
 
     format :json