diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-05-11 09:52:58 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-05-11 09:52:58 +0530 |
| commit | 2e9742997ddbfaeff350eb5334b7f641a779550c (patch) | |
| tree | 4dacf94eb6b6f67fc5c8b89b117f0babe1c2b8a4 /db/migrate | |
| parent | 2768e99ac386598480a7ac5490deee644125dfa1 (diff) | |
| parent | f7d2297c86eb84c2e2fbfa6b3e007da3c7adb5ae (diff) | |
| download | gitlab-ce-2e9742997ddbfaeff350eb5334b7f641a779550c.tar.gz | |
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20160413115152_add_token_to_web_hooks.rb | 5 | ||||
| -rw-r--r-- | db/migrate/20160508194200_remove_wall_enabled_from_projects.rb | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/db/migrate/20160413115152_add_token_to_web_hooks.rb b/db/migrate/20160413115152_add_token_to_web_hooks.rb new file mode 100644 index 00000000000..f04225068cd --- /dev/null +++ b/db/migrate/20160413115152_add_token_to_web_hooks.rb @@ -0,0 +1,5 @@ +class AddTokenToWebHooks < ActiveRecord::Migration + def change + add_column :web_hooks, :token, :string + end +end diff --git a/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb b/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb new file mode 100644 index 00000000000..aa560bc0f0c --- /dev/null +++ b/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb @@ -0,0 +1,5 @@ +class RemoveWallEnabledFromProjects < ActiveRecord::Migration + def change + remove_column :projects, :wall_enabled, :boolean, default: true, null: false + end +end |