diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index cbc58d2220305088cae01ed5b92ba3ddc32e54e6..caaefdb539b74f433beeecf81e1250f29496ca63 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -37,20 +37,6 @@ background:#fff; font-size: 11px; - &.wiki { - font-size: 13px; - code { - padding:0 4px; - } - padding:20px; - h1, h2 { - line-height: 46px; - } - h3, h4 { - line-height: 40px; - } - } - &.image_file { background:#eee; text-align:center; diff --git a/app/assets/stylesheets/sections/wiki.scss b/app/assets/stylesheets/sections/wiki.scss index 40f31490d39cd99c7ab8ecd185371b16fb543819..f3fae969c22709060c397a7aa60be3cd6b599e0e 100644 --- a/app/assets/stylesheets/sections/wiki.scss +++ b/app/assets/stylesheets/sections/wiki.scss @@ -1,3 +1,13 @@ -.wiki{ - padding: 5px; +.wiki { + font-size: 13px; + code { + padding:0 4px; + } + padding:20px; + h1, h2 { + line-height: 46px; + } + h3, h4 { + line-height: 40px; + } } diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index ba993abf7f72fdf153b000e82867868c65d5845d..fb3f2c79079f8f6f306f1b149a451bad16999400 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -176,6 +176,8 @@ module Gitlab if commit = @project.commit(identifier) link_to(identifier, project_commit_path(@project, commit), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}")) end + rescue Grit::NoSuchPathError + nil end end end