Commit 6dcb5d1b authored by James Edwards-Jones's avatar James Edwards-Jones

Issue export CSV includes "Locked"

parent a76951b1
...@@ -40,7 +40,7 @@ You will be asked to confirm the number of issues and email address for the expo ...@@ -40,7 +40,7 @@ You will be asked to confirm the number of issues and email address for the expo
> **Time Estimate** and **Time Spent** columns were [introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2627) in GitLab Starter 10.0. > **Time Estimate** and **Time Spent** columns were [introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2627) in GitLab Starter 10.0.
> >
> The **Weight** column was [introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5300) in GitLab Starter 10.8. > **Weight** and **Locked** columns were [introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5300) in GitLab Starter 10.8.
Data will be encoded with a comma as the column delimiter, with `"` used to quote fields if needed, and newlines to separate rows. The first row will be the headers, which are listed in the following table along with a description of the values: Data will be encoded with a comma as the column delimiter, with `"` used to quote fields if needed, and newlines to separate rows. The first row will be the headers, which are listed in the following table along with a description of the values:
...@@ -57,6 +57,7 @@ Data will be encoded with a comma as the column delimiter, with `"` used to quot ...@@ -57,6 +57,7 @@ Data will be encoded with a comma as the column delimiter, with `"` used to quot
| Assignee | Full name of the issue assignee | | Assignee | Full name of the issue assignee |
| Assignee Username | Username of the author, with the `@` symbol omitted | | Assignee Username | Username of the author, with the `@` symbol omitted |
| Confidential | `Yes` or `No` | | Confidential | `Yes` or `No` |
| Locked | `Yes` or `No` |
| Due Date | Formated as `YYYY-MM-DD` | | Due Date | Formated as `YYYY-MM-DD` |
| Created At (UTC) | Formated as `YYYY-MM-DD HH:MM:SS` | | Created At (UTC) | Formated as `YYYY-MM-DD HH:MM:SS` |
| Updated At (UTC) | Formated as `YYYY-MM-DD HH:MM:SS` | | Updated At (UTC) | Formated as `YYYY-MM-DD HH:MM:SS` |
......
...@@ -38,6 +38,7 @@ module Issues ...@@ -38,6 +38,7 @@ module Issues
'Assignee' => -> (issue) { issue.assignees.map(&:name).join(', ') }, 'Assignee' => -> (issue) { issue.assignees.map(&:name).join(', ') },
'Assignee Username' => -> (issue) { issue.assignees.map(&:username).join(', ') }, 'Assignee Username' => -> (issue) { issue.assignees.map(&:username).join(', ') },
'Confidential' => -> (issue) { issue.confidential? ? 'Yes' : 'No' }, 'Confidential' => -> (issue) { issue.confidential? ? 'Yes' : 'No' },
'Locked' => -> (issue) { issue.discussion_locked? ? 'Yes' : 'No' },
'Due Date' => -> (issue) { issue.due_date&.to_s(:csv) }, 'Due Date' => -> (issue) { issue.due_date&.to_s(:csv) },
'Created At (UTC)' => -> (issue) { issue.created_at&.to_s(:csv) }, 'Created At (UTC)' => -> (issue) { issue.created_at&.to_s(:csv) },
'Updated At (UTC)' => -> (issue) { issue.updated_at&.to_s(:csv) }, 'Updated At (UTC)' => -> (issue) { issue.updated_at&.to_s(:csv) },
......
--- ---
title: Issues export CSV includes issue weight title: Issues export CSV includes 'Weight' and 'Locked'
merge_request: 5300 merge_request: 5300
author: author:
type: changed type: changed
...@@ -42,6 +42,7 @@ describe Issues::ExportCsvService do ...@@ -42,6 +42,7 @@ describe Issues::ExportCsvService do
updated_at: DateTime.new(2016, 5, 4, 3, 2, 1), updated_at: DateTime.new(2016, 5, 4, 3, 2, 1),
closed_at: DateTime.new(2017, 6, 5, 4, 3, 2), closed_at: DateTime.new(2017, 6, 5, 4, 3, 2),
weight: 4, weight: 4,
discussion_locked: true,
labels: [feature_label, idea_label], labels: [feature_label, idea_label],
time_estimate: 72000) time_estimate: 72000)
issue.timelogs.create(time_spent: 360, user: user) issue.timelogs.create(time_spent: 360, user: user)
...@@ -119,6 +120,10 @@ describe Issues::ExportCsvService do ...@@ -119,6 +120,10 @@ describe Issues::ExportCsvService do
expect(csv[1]['Closed At (UTC)']).to eq nil expect(csv[1]['Closed At (UTC)']).to eq nil
end end
specify 'discussion_locked' do
expect(csv[0]['Locked']).to eq 'Yes'
end
specify 'weight' do specify 'weight' do
expect(csv[0]['Weight']).to eq '4' expect(csv[0]['Weight']).to eq '4'
end end
......
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