diff options
| author | James Lopez <james@jameslopez.es> | 2016-09-02 15:23:53 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-09-09 14:56:10 +0200 |
| commit | 1631ceff19025714d71ef0f91bf247d1d12cefdb (patch) | |
| tree | 2c102ddd3c154747cc06cefcc328d837f97f80ad | |
| parent | e2827250c3617602a0ca89ee4d974cbd17a53892 (diff) | |
| download | gitlab-ce-1631ceff19025714d71ef0f91bf247d1d12cefdb.tar.gz | |
fix attributes missing in spec after rebase with master
| -rw-r--r-- | spec/lib/gitlab/import_export/attribute_configuration_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/import_export/attribute_configuration_spec.rb b/spec/lib/gitlab/import_export/attribute_configuration_spec.rb index d0f19cf323a..526919fb93b 100644 --- a/spec/lib/gitlab/import_export/attribute_configuration_spec.rb +++ b/spec/lib/gitlab/import_export/attribute_configuration_spec.rb @@ -39,8 +39,8 @@ describe 'Attribute configuration', lib: true do 'Ci::Variable' => %w[id project_id key value encrypted_value encrypted_value_salt encrypted_value_iv gl_project_id], 'Ci::Trigger' => %w[id token project_id deleted_at created_at updated_at gl_project_id], 'DeployKey' => %w[id user_id created_at updated_at key title type fingerprint public], - 'Service' => %w[id type title project_id created_at updated_at active properties template push_events issues_events merge_requests_events tag_push_events note_events pipeline_events build_events category default wiki_page_events], - 'ProjectHook' => %w[id url project_id created_at updated_at type service_id push_events issues_events merge_requests_events tag_push_events note_events pipeline_events enable_ssl_verification build_events wiki_page_events token group_id], + 'Service' => %w[id type title project_id created_at updated_at active properties template push_events issues_events merge_requests_events tag_push_events note_events pipeline_events build_events category default wiki_page_events confidential_issues_events], + 'ProjectHook' => %w[id url project_id created_at updated_at type service_id push_events issues_events merge_requests_events tag_push_events note_events pipeline_events enable_ssl_verification build_events wiki_page_events token group_id confidential_issues_events], 'ProtectedBranch' => %w[id project_id name created_at updated_at], 'Project' => %w[description issues_enabled merge_requests_enabled wiki_enabled snippets_enabled visibility_level archived], 'Author' => %w[name] |