Fixes issue with rails reserved keyword type exporting/importing services. Also fixed CustomIssueTrackerService title setter and added relevant specs.
This commit is contained in:
parent
1aca3670b0
commit
a9f1e972ec
|
@ -8,6 +8,7 @@ v 8.12.2 (unreleased)
|
|||
v 8.12.1
|
||||
- Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST
|
||||
- Fix issue with search filter labels not displaying
|
||||
- Fix Import/Export not recognising correctly the imported services.
|
||||
|
||||
v 8.12.0
|
||||
- Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251
|
||||
|
|
|
@ -9,6 +9,10 @@ class CustomIssueTrackerService < IssueTrackerService
|
|||
end
|
||||
end
|
||||
|
||||
def title=(value)
|
||||
self.properties['title'] = value if self.properties
|
||||
end
|
||||
|
||||
def description
|
||||
if self.properties && self.properties['description'].present?
|
||||
self.properties['description']
|
||||
|
|
|
@ -73,5 +73,7 @@ excluded_attributes:
|
|||
methods:
|
||||
statuses:
|
||||
- :type
|
||||
services:
|
||||
- :type
|
||||
merge_request_diff:
|
||||
- :utf8_st_diffs
|
||||
|
|
|
@ -6918,6 +6918,7 @@
|
|||
"note_events": true,
|
||||
"build_events": true,
|
||||
"category": "issue_tracker",
|
||||
"type": "CustomIssueTrackerService",
|
||||
"default": true,
|
||||
"wiki_page_events": true
|
||||
},
|
||||
|
|
|
@ -107,6 +107,12 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
|
|||
expect(Label.first.label_links.first.target).not_to be_nil
|
||||
end
|
||||
|
||||
it 'restores the correct service' do
|
||||
restored_project_json
|
||||
|
||||
expect(CustomIssueTrackerService.first).not_to be_nil
|
||||
end
|
||||
|
||||
context 'Merge requests' do
|
||||
before do
|
||||
restored_project_json
|
||||
|
|
|
@ -111,6 +111,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
|
|||
expect(saved_project_json['issues'].first['label_links'].first['label']).not_to be_empty
|
||||
end
|
||||
|
||||
it 'saves the correct service type' do
|
||||
expect(saved_project_json['services'].first['type']).not_to be_nil
|
||||
end
|
||||
|
||||
it 'has project feature' do
|
||||
project_feature = saved_project_json['project_feature']
|
||||
expect(project_feature).not_to be_empty
|
||||
|
@ -161,6 +165,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
|
|||
commit_id: ci_pipeline.sha)
|
||||
|
||||
create(:event, target: milestone, project: project, action: Event::CREATED, author: user)
|
||||
create(:service, project: project, type: 'CustomIssueTrackerService', category: 'issue_tracker')
|
||||
|
||||
project.project_feature.update_attribute(:issues_access_level, ProjectFeature::DISABLED)
|
||||
project.project_feature.update_attribute(:wiki_access_level, ProjectFeature::ENABLED)
|
||||
|
|
Loading…
Reference in New Issue