diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-29 12:26:44 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-29 12:26:44 +0300 |
| commit | 18a9151bf60d0dd464a8e961d36bf778362d7b61 (patch) | |
| tree | 6937ab0364ee5e5ad5a56761eecc7c8b5da0a6f5 | |
| parent | 332a17cf42a15fb39396ebc85bcbe997054f9a31 (diff) | |
| parent | ac8f1ba876406498655c72c71ff6b3cdd4fe994b (diff) | |
| download | gitlab-ce-18a9151bf60d0dd464a8e961d36bf778362d7b61.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
| -rw-r--r-- | lib/api/api.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index a640a4e2051..586e7b5f8da 100644 --- 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; } } } diff --git a/lib/api/api.rb b/lib/api/api.rb index 60858a39407..d2a35c78fc1 100644 --- 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 |