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

18a9151b · Dmitriy Zaporozhets · 332a17cf · ac8f1ba8 · 18a9151b · 18a9151b
Commit 18a9151b authored Apr 29, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/assets/stylesheets/pages/issuable.scss app/assets/stylesheets/pages/issuable.scss +1 -1

lib/api/api.rb lib/api/api.rb +1 -1

No files found.
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -19,7 +19,7 @@
    &.affix {
      position: fixed;
      top: 70px;
-      width: 220px;
+      margin-right: 35px;
    }
  }
 }

--- a/lib/api/api.rb
+++ b/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