diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-14 13:05:33 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-14 13:05:33 +0200 |
| commit | cd52cef1c0898230cb684ee294bd7a6c5b2f226a (patch) | |
| tree | eb55e471d7d5e3d626f266b77f6931c708e145d4 /lib/redcarpet/render/gitlab_html.rb | |
| parent | 910794bae5a91479f41468ebc345db680a33b20e (diff) | |
| download | gitlab-ce-dashboard-references.tar.gz | |
Fix reference links in dashboard activity and ATOM feeds.dashboard-references
Diffstat (limited to 'lib/redcarpet/render/gitlab_html.rb')
| -rw-r--r-- | lib/redcarpet/render/gitlab_html.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb index 15eb6effe08..7dcecc2ecf6 100644 --- a/lib/redcarpet/render/gitlab_html.rb +++ b/lib/redcarpet/render/gitlab_html.rb @@ -7,9 +7,12 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML def initialize(template, color_scheme, options = {}) @template = template @color_scheme = color_scheme - @project = @template.instance_variable_get("@project") @options = options.dup + @options.reverse_merge!( + project: @template.instance_variable_get("@project") + ) + super(options) end |