Merge branch 'fix/fork-spec-mysql' into 'master'

Fix fork_spec failure to do with mySQL Closes #31870 See merge request !11121

Merge branch 'fix/fork-spec-mysql' into 'master'
0e13c0a9 · Stan Hu · Felipe Artur · a70276fa · 0e13c0a9
Commit 0e13c0a9 authored May 06, 2017 by Stan Hu Committed by Felipe Artur May 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

import_export.yml lib/gitlab/import_export/import_export.yml +3 -2

No files found.
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -84,6 +84,8 @@ excluded_attributes:
    - :import_jid
    - :id
    - :star_count
+    - :last_repository_updated_at
+    - :last_repository_check_at
  snippets:
    - :expired_at
  merge_request_diff:
@@ -113,4 +115,4 @@ methods:
  merge_requests:
    - :diff_head_sha
  project:
-    - :description_html
\ No newline at end of file
+    - :description_html