Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection

Conflicts:
	CHANGELOG
	db/schema.rb

2 files changed, 6 insertions, 0 deletions

diff --git a/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb b/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb
new file mode 100644
index 00000000000..c28ba3197ac
--- /dev/null
+++ b/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb
@@ -0,0 +1,5 @@
+class AddGitlabAccessTokenToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :gitlab_access_token, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 32e49ff7a74..0e4af3df7c2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -435,6 +435,7 @@ ActiveRecord::Schema.define(version: 20150125163100) do
     t.boolean  "hide_no_ssh_key",          default: false
     t.string   "website_url",              default: "",    null: false
     t.string   "github_access_token"
+    t.string   "gitlab_access_token"
   end
 
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree