diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-03 19:36:03 +0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-05-13 00:08:35 +0300 |
| commit | e30860fbff2acc8d191bcbe262143c7142230afe (patch) | |
| tree | bf1129d26bd6ac6248a14435c96fa3f8be999358 | |
| parent | 0e13c0a9a1b984936b8b364a6cde60c4b0a90cc3 (diff) | |
Merge branch 'fix/project-tree-saver-spec' into 'master'
Fix project tree saver and fork spec failures
Closes #31746
See merge request !11076
| -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 61a163d943a..101d88cfa30 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -86,6 +86,7 @@ excluded_attributes: - :star_count - :last_repository_updated_at - :last_repository_check_at + - :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) |