diff options
| author | James Lopez <james@gitlab.com> | 2017-05-03 16:36:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-03 16:36:01 +0000 |
| commit | cf3990cfbfe878f8b4f867042ee0967f947718ee (patch) | |
| tree | 232ea36d98156d8ff76858db3a5740ef3ac8f94a | |
| parent | 6c2569fb3f2c24f14ae2fae7311aa9fe3799273f (diff) | |
| download | gitlab-ce-cf3990cfbfe878f8b4f867042ee0967f947718ee.tar.gz | |
Fix project tree saver and fork spec failures
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/project_tree_saver_spec.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index b95cea371b9..3aac731e844 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -84,6 +84,7 @@ excluded_attributes: - :import_jid - :id - :star_count + - :last_activity_at snippets: - :expired_at merge_request_diff: diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb index 6e145947104..1035428b2e7 100644 --- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb @@ -6,7 +6,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do let(:project_tree_saver) { described_class.new(project: project, current_user: user, shared: shared) } let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" } let(:user) { create(:user) } - let(:project) { setup_project } + let!(:project) { setup_project } before do project.team << [user, :master] @@ -219,7 +219,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do releases: [release], group: group ) - project.update(description_html: 'description') + project.update_column(:description_html, 'description') project_label = create(:label, project: project) group_label = create(:group_label, group: group) create(:label_link, label: project_label, target: issue) |