summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-27 07:55:30 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-27 07:55:30 +0000
commite322bdbd5ea9de9bf2b7a5c1efb115e294289918 (patch)
treede35308c2012f8a804930b4ba716cd85900b4d59 /spec
parent3713fc6cdfc45506668a1678503fac8e48221df0 (diff)
parent39a2adf4f49981dda9ab3e0d6a23b74acccbe128 (diff)
downloadgitlab-ce-e322bdbd5ea9de9bf2b7a5c1efb115e294289918.tar.gz
Merge branch 'fix/test' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce
Diffstat (limited to 'spec')
-rw-r--r--spec/models/project_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 6837e4c9196..6bae5951b7b 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -101,7 +101,7 @@ describe Project do
it "returns the web URL without the protocol for this repo" do
project = Project.new(path: "somewhere")
- project.web_url_without_protocol.should == "#{Gitlab.config.gitlab.host}/somewhere"
+ project.web_url_without_protocol.should == "#{Gitlab.config.gitlab.url.split("://")[1]}/somewhere"
end
describe "last_activity methods" do