Commit 9f9a7a2d authored by James Edwards-Jones's avatar James Edwards-Jones

Added ProtectedTag to import/export son and safe_model_attributes

parent d85471ac
...@@ -7455,6 +7455,24 @@ ...@@ -7455,6 +7455,24 @@
] ]
} }
], ],
"protected_tags": [
{
"id": 1,
"project_id": 9,
"name": "v*",
"created_at": "2017-04-04T13:48:13.426Z",
"updated_at": "2017-04-04T13:48:13.426Z",
"create_access_levels": [
{
"id": 1,
"protected_tag_id": 1,
"access_level": 40,
"created_at": "2017-04-04T13:48:13.458Z",
"updated_at": "2017-04-04T13:48:13.458Z"
}
]
}
],
"project_feature": { "project_feature": {
"builds_access_level": 0, "builds_access_level": 0,
"created_at": "2014-12-26T09:26:45.000Z", "created_at": "2014-12-26T09:26:45.000Z",
......
...@@ -64,6 +64,10 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do ...@@ -64,6 +64,10 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
expect(ProtectedBranch.first.push_access_levels).not_to be_empty expect(ProtectedBranch.first.push_access_levels).not_to be_empty
end end
it 'contains the create access levels on a protected tag' do
expect(ProtectedTag.first.create_access_levels).not_to be_empty
end
context 'event at forth level of the tree' do context 'event at forth level of the tree' do
let(:event) { Event.where(title: 'test levels').first } let(:event) { Event.where(title: 'test levels').first }
......
...@@ -300,6 +300,12 @@ ProtectedBranch: ...@@ -300,6 +300,12 @@ ProtectedBranch:
- name - name
- created_at - created_at
- updated_at - updated_at
ProtectedTag:
- id
- project_id
- name
- created_at
- updated_at
Project: Project:
- description - description
- issues_enabled - issues_enabled
...@@ -333,6 +339,14 @@ ProtectedBranch::PushAccessLevel: ...@@ -333,6 +339,14 @@ ProtectedBranch::PushAccessLevel:
- access_level - access_level
- created_at - created_at
- updated_at - updated_at
ProtectedTag::CreateAccessLevel:
- id
- protected_tag_id
- access_level
- created_at
- updated_at
- user_id
- group_id
AwardEmoji: AwardEmoji:
- id - id
- user_id - user_id
......
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