Automatic merge of gitlab-org/gitlab-ce master

.codeclimate.yml

@@ -6,35 +6,35 @@ engines:
     enabled: true
     config:
       languages:
-      - ruby
-      - javascript
+        - ruby
+        - javascript
 ratings:
   paths:
-  - Gemfile.lock
-  - "**.erb"
-  - "**.haml"
-  - "**.rb"
-  - "**.rhtml"
-  - "**.slim"
-  - "**.inc"
-  - "**.js"
-  - "**.jsx"
-  - "**.module"
+    - Gemfile.lock
+    - "**.erb"
+    - "**.haml"
+    - "**.rb"
+    - "**.rhtml"
+    - "**.slim"
+    - "**.inc"
+    - "**.js"
+    - "**.jsx"
+    - "**.module"
 exclude_paths:
-- config/
-- db/
-- features/
-- node_modules/
-- spec/
-- vendor/
-- .yarn-cache/
-- tmp/
-- builds/
-- coverage/
-- public/
-- shared/
-- webpack-report/
-- log/
-- backups/
-- coverage-javascript/
-- plugins/
+  - config/
+  - db/
+  - features/
+  - node_modules/
+  - spec/
+  - vendor/
+  - .yarn-cache/
+  - tmp/
+  - builds/
+  - coverage/
+  - public/
+  - shared/
+  - webpack-report/
+  - log/
+  - backups/
+  - coverage-javascript/
+  - plugins/

.haml-lint.yml

@@ -153,7 +153,7 @@ linters:
 
   Indentation:
     enabled: true
-    character: space # or tab
+    character: space  # or tab
 
   TagName:
     enabled: true

.pkgr.yml

@@ -3,8 +3,8 @@ group: git
 services:
   - postgres
 before_precompile: ./bin/pkgr_before_precompile.sh
-env: 
-  - SKIP_STORAGE_VALIDATION=true 
+env:
+  - SKIP_STORAGE_VALIDATION=true
 targets:
   debian-7: &wheezy
     build_dependencies:

changelogs/unreleased/49517-fix-notes-import-export.yml

+---
+title: Fix diff notes and discussion notes being exported as regular notes
+merge_request: 28401
+author:
+type: fixed

changelogs/unreleased/60818_yamllint_project_root.yml

+---
+title: Fix yaml linting for project root *.yml files
+merge_request: 27579
+author: Will Hall
+type: fixed

lib/gitlab/import_export/import_export.yml

@@ -189,6 +189,8 @@ excluded_attributes:
     - :enabled
 
 methods:
+  notes:
+    - :type
   labels:
     - :type
   label:

spec/lib/gitlab/import_export/project_tree_saver_spec.rb

@@ -95,7 +95,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
       end
 
       it 'has issue comments' do
-        expect(saved_project_json['issues'].first['notes']).not_to be_empty
+        notes = saved_project_json['issues'].first['notes']
+
+        expect(notes).not_to be_empty
+        expect(notes.first['type']).to eq('DiscussionNote')
       end
 
       it 'has issue assignees' do
@@ -304,7 +307,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
     create(:commit_status, project: project, pipeline: ci_build.pipeline)
 
     create(:milestone, project: project)
-    create(:note, noteable: issue, project: project)
+    create(:discussion_note, noteable: issue, project: project)
     create(:note, noteable: merge_request, project: project)
     create(:note, noteable: snippet, project: project)
     create(:note_on_commit,