Revert "Merge branch '1937-https-clone-url-username' into 'master'

This reverts commit c425f366bf, reversing
changes made to 82f6c0f5ac.

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/helpers/button_helper.rb

@@ -56,7 +56,7 @@ module ButtonHelper
 
     content_tag (append_link ? :a : :span), protocol,
       class: klass,
-      href: (project.http_url_to_repo(current_user) if append_link),
+      href: (project.http_url_to_repo if append_link),
       data: {
         html: true,
         placement: placement,

app/helpers/projects_helper.rb

@@ -276,7 +276,7 @@ module ProjectsHelper
     when 'ssh'
       project.ssh_url_to_repo
     else
-      project.http_url_to_repo(current_user)
+      project.http_url_to_repo
     end
   end
 

app/models/project.rb

@@ -873,10 +873,8 @@ class Project < ActiveRecord::Base
     url_to_repo
   end
 
-  def http_url_to_repo(user = nil)
+  def http_url_to_repo
-    credentials = Gitlab::UrlSanitizer.http_credentials_for_user(user)
+    "#{web_url}.git"
-
-    Gitlab::UrlSanitizer.new("#{web_url}.git", credentials: credentials).full_url
   end
 
   def user_can_push_to_empty_repo?(user)

features/steps/explore/projects.rb

@@ -49,7 +49,7 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
 
   step 'I should see an http link to the repository' do
     project = Project.find_by(name: 'Community')
-    expect(page).to have_field('project_clone', with: project.http_url_to_repo(@user))
+    expect(page).to have_field('project_clone', with: project.http_url_to_repo)
   end
 
   step 'I should see an ssh link to the repository' do

spec/features/admin/admin_disables_git_access_protocol_spec.rb

@@ -32,7 +32,7 @@ feature 'Admin disables Git access protocol', feature: true do
     scenario 'shows only HTTP url' do
       visit_project
 
-      expect(page).to have_content("git clone #{project.http_url_to_repo(admin)}")
+      expect(page).to have_content("git clone #{project.http_url_to_repo}")
       expect(page).not_to have_selector('#clone-dropdown')
     end
   end

spec/features/projects/developer_views_empty_project_instructions_spec.rb

@@ -56,14 +56,8 @@ feature 'Developer views empty project instructions', feature: true do
   end
 
   def expect_instructions_for(protocol)
-    url = 
+    msg = :"#{protocol.downcase}_url_to_repo"
-      case protocol
-      when 'ssh'
-        project.ssh_url_to_repo
-      when 'http'
-        project.http_url_to_repo(developer)
-      end
 
-    expect(page).to have_content("git clone #{url}")
+    expect(page).to have_content("git clone #{project.send(msg)}")
   end
 end

spec/models/project_spec.rb

@@ -1909,22 +1909,12 @@ describe Project, models: true do
   describe '#http_url_to_repo' do
     let(:project) { create :empty_project }
 
-    context 'when no user is given' do
     it 'returns the url to the repo without a username' do
       expect(project.http_url_to_repo).to eq("#{project.web_url}.git")
       expect(project.http_url_to_repo).not_to include('@')
     end
   end
 
-    context 'when user is given' do
-      it 'returns the url to the repo with the username' do
-        user = build_stubbed(:user)
-
-        expect(project.http_url_to_repo(user)).to start_with("http://#{user.username}@")
-      end
-    end
-  end
-
   describe '#pipeline_status' do
     let(:project) { create(:project) }
     it 'builds a pipeline status' do