summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-08 18:12:16 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-08 18:12:16 -0600
commit63c5b541a3be014341b3b239cb795479026e9a99 (patch)
treed1fd9cd87b44d8f7926b25497e4cffb4dce6d6ef
parentb0afed1aac83996747820728ee2a5d618f5caf3c (diff)
downloadgitlab-ce-63c5b541a3be014341b3b239cb795479026e9a99.tar.gz
Satisfy the new rubocop :)
-rw-r--r--db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb6
-rw-r--r--db/migrate/20160801163709_add_submitted_as_ham_to_spam_logs.rb6
2 files changed, 10 insertions, 2 deletions
diff --git a/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb
index 15ad8e8bcbb..6ca97e39a3d 100644
--- a/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb
+++ b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb
@@ -3,7 +3,11 @@ class AddDevelopersCanMergeToProtectedBranches < ActiveRecord::Migration
disable_ddl_transaction!
- def change
+ def up
add_column_with_default :protected_branches, :developers_can_merge, :boolean, default: false, allow_null: false
end
+
+ def down
+ remove_column :protected_branches, :developers_can_merge
+ end
end
diff --git a/db/migrate/20160801163709_add_submitted_as_ham_to_spam_logs.rb b/db/migrate/20160801163709_add_submitted_as_ham_to_spam_logs.rb
index 296f1dfac7b..20a77000ba8 100644
--- a/db/migrate/20160801163709_add_submitted_as_ham_to_spam_logs.rb
+++ b/db/migrate/20160801163709_add_submitted_as_ham_to_spam_logs.rb
@@ -14,7 +14,11 @@ class AddSubmittedAsHamToSpamLogs < ActiveRecord::Migration
disable_ddl_transaction!
- def change
+ def up
add_column_with_default :spam_logs, :submitted_as_ham, :boolean, default: false
end
+
+ def down
+ remove_column :spam_logs, :submitted_as_ham
+ end
end