Commit d435d99f authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch '296651-fix-bitbucket-import-project-description' into 'master'

Use Bitbucket repo description over project description when importing

See merge request gitlab-org/gitlab!78160
parents f1562e65 e0399247
...@@ -30,7 +30,7 @@ module BitbucketServer ...@@ -30,7 +30,7 @@ module BitbucketServer
end end
def description def description
project['description'] raw['description']
end end
def full_name def full_name
......
...@@ -9,6 +9,7 @@ RSpec.describe BitbucketServer::Representation::Repo do ...@@ -9,6 +9,7 @@ RSpec.describe BitbucketServer::Representation::Repo do
"slug": "rouge", "slug": "rouge",
"id": 1, "id": 1,
"name": "rouge", "name": "rouge",
"description": "Rogue Repo",
"scmId": "git", "scmId": "git",
"state": "AVAILABLE", "state": "AVAILABLE",
"statusMessage": "Available", "statusMessage": "Available",
...@@ -17,7 +18,7 @@ RSpec.describe BitbucketServer::Representation::Repo do ...@@ -17,7 +18,7 @@ RSpec.describe BitbucketServer::Representation::Repo do
"key": "TEST", "key": "TEST",
"id": 1, "id": 1,
"name": "test", "name": "test",
"description": "Test", "description": "Test Project",
"public": false, "public": false,
"type": "NORMAL", "type": "NORMAL",
"links": { "links": {
...@@ -73,7 +74,7 @@ RSpec.describe BitbucketServer::Representation::Repo do ...@@ -73,7 +74,7 @@ RSpec.describe BitbucketServer::Representation::Repo do
end end
describe '#description' do describe '#description' do
it { expect(subject.description).to eq('Test') } it { expect(subject.description).to eq('Rogue Repo') }
end end
describe '#full_name' do describe '#full_name' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment