summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-01-04 14:43:13 +0000
committerDouwe Maan <douwe@gitlab.com>2017-01-04 14:43:13 +0000
commit71a692c16db2aacd1dcbb55542e64ee269939feb (patch)
tree5cae27e37790bab8cea9668bfd05231ee8f88280
parentc36ab8acdcab2a843da38e133122aaa856fc4f4a (diff)
parent602ea41d4b7af8962523a8da94e3fe820eb8dbf5 (diff)
downloadgitlab-ce-71a692c16db2aacd1dcbb55542e64ee269939feb.tar.gz
Merge branch 'rs-remove-unused-method' into 'master'
Remove unused `Project#web_url_without_protocol` method See merge request !8416
-rw-r--r--app/models/project.rb4
-rw-r--r--spec/models/project_spec.rb8
2 files changed, 0 insertions, 12 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 11ca09668e0..ec40def6fb1 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -609,10 +609,6 @@ class Project < ActiveRecord::Base
Gitlab::Routing.url_helpers.namespace_project_url(self.namespace, self)
end
- def web_url_without_protocol
- web_url.split('://')[1]
- end
-
def new_issue_address(author)
return unless Gitlab::IncomingEmail.supports_issue_creation? && author
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index fb225eb7625..3ec7bb46686 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -362,14 +362,6 @@ describe Project, models: true do
end
end
- describe "#web_url_without_protocol" do
- let(:project) { create(:empty_project, path: "somewhere") }
-
- it 'returns the web URL without the protocol for this repo' do
- expect(project.web_url_without_protocol).to eq("#{Gitlab.config.gitlab.url.split('://')[1]}/#{project.namespace.path}/somewhere")
- end
- end
-
describe "#new_issue_address" do
let(:project) { create(:empty_project, path: "somewhere") }
let(:user) { create(:user) }