Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-20 18:07:58 +0300
committerDouwe Maan <douwe@gitlab.com>2015-09-20 18:07:58 +0300
commit2c0704fabcf81a995ed67ddeac56f4bbcd44ac12 (patch)
tree766c564d5c0e5b230a83d19c1d63f7eeedcd99d2 /db/migrate
parentd622df0bf8dea5167f53b3b5595832e7a77b93e6 (diff)
parent259851c0d601632ad02a9f6ac0d59276552570b9 (diff)
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/migrate')
-rw-r--r--db/migrate/20150920010715_add_consumed_timestep_to_users.rb5
1 files changed, 5 insertions, 0 deletions
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