diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-20 15:07:58 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-20 15:07:58 +0000 |
| commit | 2c0704fabcf81a995ed67ddeac56f4bbcd44ac12 (patch) | |
| tree | 766c564d5c0e5b230a83d19c1d63f7eeedcd99d2 /db | |
| parent | d622df0bf8dea5167f53b3b5595832e7a77b93e6 (diff) | |
| parent | 259851c0d601632ad02a9f6ac0d59276552570b9 (diff) | |
| download | gitlab-ce-2c0704fabcf81a995ed67ddeac56f4bbcd44ac12.tar.gz | |
Merge branch 'rs-bump-two-factor' into 'master'
Bump devise-two-factor to 2.0.0
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605
See https://github.com/tinfoil/devise-two-factor/pull/43
See merge request !1363
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/production/001_admin.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20150920010715_add_consumed_timestep_to_users.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index 1c8740f6ba9..b0c0b6450f6 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -19,7 +19,7 @@ admin = User.create( admin.projects_limit = 10000 admin.admin = true admin.save! -admin.confirm! +admin.confirm if admin.valid? puts %Q[ diff --git a/db/migrate/20150920010715_add_consumed_timestep_to_users.rb b/db/migrate/20150920010715_add_consumed_timestep_to_users.rb new file mode 100644 index 00000000000..c8438b3f6aa --- /dev/null +++ b/db/migrate/20150920010715_add_consumed_timestep_to_users.rb @@ -0,0 +1,5 @@ +class AddConsumedTimestepToUsers < ActiveRecord::Migration + def change + add_column :users, :consumed_timestep, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index d70c4b58e93..b8eb9d26779 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150918084513) do +ActiveRecord::Schema.define(version: 20150920010715) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -749,6 +749,7 @@ ActiveRecord::Schema.define(version: 20150918084513) do t.string "public_email", default: "", null: false t.integer "dashboard", default: 0 t.integer "project_view", default: 0 + t.integer "consumed_timestep" end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |