diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-15 09:59:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-15 09:59:26 +0000 |
| commit | 9c6f4a2351e9b5757f4f508388bc099fbeea5788 (patch) | |
| tree | ef93864f4b1d3f16ccbdfb1166a8a563fd9aa52c /spec | |
| parent | de1aca131e74af8ef77005198d9be99ac2a8091d (diff) | |
| parent | cd52cef1c0898230cb684ee294bd7a6c5b2f226a (diff) | |
| download | gitlab-ce-9c6f4a2351e9b5757f4f508388bc099fbeea5788.tar.gz | |
Merge branch 'dashboard-references' into 'master'
Fix reference links in dashboard activity and ATOM feeds.
References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.
This MR passes the project in question to the reference parsers in an option.
cc @rspeicher
See merge request !653
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/helpers/gitlab_markdown_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index 7d0335c2320..9f3e8cf585e 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -21,7 +21,7 @@ describe GitlabMarkdownHelper do describe "#gfm" do it "should forward HTML options to links" do - expect(gfm("Fixed in #{commit.id}", @project, class: 'foo')). + expect(gfm("Fixed in #{commit.id}", { project: @project }, class: 'foo')). to have_selector('a.gfm.foo') end |