summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-15 06:53:42 +0000
committerDouwe Maan <douwe@gitlab.com>2015-04-15 06:53:42 +0000
commit63b21945d2a6d53c7baa65bffcac33ab5fa8bb91 (patch)
tree250754a33d53845d5f720d97a7648fd9ebe97eb9 /db
parent61c79418c46105ecedfca3701b7e4ac9ba6ba601 (diff)
parent9d00bb08962e26b0c284bcfc5e7ed52cf141d5c6 (diff)
downloadgitlab-ce-63b21945d2a6d53c7baa65bffcac33ab5fa8bb91.tar.gz
Merge branch 'google-code-import' into 'master'
Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20150327150017_add_import_data_to_project.rb5
-rw-r--r--db/schema.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20150327150017_add_import_data_to_project.rb b/db/migrate/20150327150017_add_import_data_to_project.rb
new file mode 100644
index 00000000000..12c00339eec
--- /dev/null
+++ b/db/migrate/20150327150017_add_import_data_to_project.rb
@@ -0,0 +1,5 @@
+class AddImportDataToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :import_data, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7f464d7f973..a54fb4b7098 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -343,6 +343,7 @@ ActiveRecord::Schema.define(version: 20150413192223) do
t.integer "star_count", default: 0, null: false
t.string "import_type"
t.string "import_source"
+ t.text "import_data"
end
add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree