Use project key instead of project name for imports

3 files changed, 9 insertions, 1 deletions

diff --git a/app/views/import/bitbucket_server/status.html.haml b/app/views/import/bitbucket_server/status.html.haml
index 3be92121c5a..b6ff2968a20 100644
--- a/app/views/import/bitbucket_server/status.html.haml
+++ b/app/views/import/bitbucket_server/status.html.haml
@@ -50,7 +50,7 @@
               = project.human_import_status_name
 
       - @repos.each do |repo|
-        %tr{ id: "repo_#{repo.owner}___#{repo.slug}", data: { project: repo.project_name, repository: repo.slug } }
+        %tr{ id: "repo_#{repo.owner}___#{repo.slug}", data: { project: repo.project_key, repository: repo.slug } }
           %td
             = link_to repo.browse_url, repo.browse_url, target: '_blank', rel: 'noopener noreferrer'
           %td.import-target
diff --git a/lib/bitbucket_server/representation/repo.rb b/lib/bitbucket_server/representation/repo.rb
index 9c518341e66..6c494b79166 100644
--- a/lib/bitbucket_server/representation/repo.rb
+++ b/lib/bitbucket_server/representation/repo.rb
@@ -7,6 +7,10 @@ module BitbucketServer
         super(raw)
       end
 
+      def project_key
+        raw.dig('project', 'key')
+      end
+
       def project_name
         raw.dig('project', 'name')
       end
diff --git a/spec/lib/bitbucket_server/representation/repo_spec.rb b/spec/lib/bitbucket_server/representation/repo_spec.rb
index 9021da4c503..3ac1030fbb0 100644
--- a/spec/lib/bitbucket_server/representation/repo_spec.rb
+++ b/spec/lib/bitbucket_server/representation/repo_spec.rb
@@ -50,6 +50,10 @@ describe BitbucketServer::Representation::Repo do
 
   subject { described_class.new(JSON.parse(sample_data)) }
 
+  describe '#project_key' do
+    it { expect(subject.project_key).to eq('TEST') }
+  end
+
   describe '#project_name' do
     it { expect(subject.project_name).to eq('test') }
   end