summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-28 22:52:44 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-28 22:52:44 -0800
commit815e9aa283f113051268370908776c5517dab711 (patch)
tree9beaa0dfa9aa5dee5e76581cc6d7f4b90b5c6d1a /spec
parent792ced2f4190226c3335967a8e5a30d3b72bd4ae (diff)
parent2149f8b52c8f0d8333707f7c798b0e6a8a892c1c (diff)
downloadgitlab-ce-815e9aa283f113051268370908776c5517dab711.tar.gz
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar
Diffstat (limited to 'spec')
-rw-r--r--spec/helpers/gitlab_markdown_helper_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 5c9eea956f3..d633287b2a9 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -23,6 +23,7 @@ describe GitlabMarkdownHelper do
@project = project
@ref = 'markdown'
@repository = project.repository
+ @request.host = Gitlab.config.gitlab.host
end
describe "#gfm" do