Merge branch 'fix-import-export-not-inverses-34769' into 'master'

Export Csv Update

See merge request gitlab-org/gitlab!80179

app/services/issues/export_csv_service.rb

@@ -23,11 +23,11 @@ module Issues
 
     def header_to_value_hash
       {
+        'Title' => 'title',
+        'Description' => 'description',
        'Issue ID' => 'iid',
        'URL' => -> (issue) { issue_url(issue) },
-       'Title' => 'title',
        'State' => -> (issue) { issue.closed? ? 'Closed' : 'Open' },
-       'Description' => 'description',
        'Author' => 'author_name',
        'Author Username' => -> (issue) { issue.author&.username },
        'Assignee' => -> (issue) { issue.assignees.map(&:name).join(', ') },

app/services/merge_requests/export_csv_service.rb

@@ -13,11 +13,11 @@ module MergeRequests
 
     def header_to_value_hash
       {
+        'Title' => 'title',
+        'Description' => 'description',
         'MR IID' => 'iid',
         'URL' => -> (merge_request) { merge_request_url(merge_request) },
-        'Title' => 'title',
         'State' => 'state',
-        'Description' => 'description',
         'Source Branch' => 'source_branch',
         'Target Branch' => 'target_branch',
         'Source Project ID' => 'source_project_id',

doc/user/project/issues/csv_export.md

@@ -52,7 +52,7 @@ export, after which the email is prepared.
 
 ## Sorting
 
-Exported issues are always sorted by `Issue ID`.
+Exported issues are always sorted by `Title`.
 
 ## Format
 
@@ -63,11 +63,11 @@ the values:
 
 | Column                                   | Description                                               |
 |------------------------------------------|-----------------------------------------------------------|
+| Title                                    | Issue `title`                                             |
+| Description                              | Issue `description`                                       |
 | Issue ID                                 | Issue `iid`                                               |
 | URL                                      | A link to the issue on GitLab                             |
-| Title                                    | Issue `title`                                             |
 | State                                    | `Open` or `Closed`                                        |
-| Description                              | Issue `description`                                       |
 | Author                                   | Full name of the issue author                             |
 | Author Username                          | Username of the author, with the `@` symbol omitted       |
 | Assignee                                 | Full name of the issue assignee                           |
@@ -85,6 +85,10 @@ the values:
 | [Epic](../../group/epics/index.md) ID    | ID of the parent epic, introduced in 12.7                 |
 | [Epic](../../group/epics/index.md) Title | Title of the parent epic, introduced in 12.7              |
 
+In GitLab 14.7 and earlier, the first two columns were `Issue ID` and `URL`,
+which [caused an issue](https://gitlab.com/gitlab-org/gitlab/-/issues/34769)
+when importing back into GitLab.
+
 ## Limitations
 
 - Export Issues to CSV is not available at the Group's Issues List.

doc/user/project/merge_requests/csv_export.md

@@ -18,11 +18,11 @@ The following table shows what attributes will be present in the CSV.
 
 | Column             | Description                                                  |
 |--------------------|--------------------------------------------------------------|
+| Title              | Merge request title                                          |
+| Description        | Merge request description                                    |
 | MR ID              | MR `iid`                                                     |
 | URL                | A link to the merge request on GitLab                        |
-| Title              | Merge request title                                          |
 | State              | Opened, Closed, Locked, or Merged                            |
-| Description        | Merge request description                                    |
 | Source Branch      | Source branch                                                |
 | Target Branch      | Target branch                                                |
 | Source Project ID  | ID of the source project                                     |
@@ -39,6 +39,10 @@ The following table shows what attributes will be present in the CSV.
 | Created At (UTC)   | Formatted as `YYYY-MM-DD HH:MM:SS`                           |
 | Updated At (UTC)   | Formatted as `YYYY-MM-DD HH:MM:SS`                           |
 
+In GitLab 14.7 and earlier, the first two columns were `MR ID` and `URL`,
+which [caused an issue](https://gitlab.com/gitlab-org/gitlab/-/issues/34769)
+when importing back into GitLab.
+
 ## Limitations
 
 - Export merge requests to CSV is not available at the Group's merge request list.