diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-05 19:36:12 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-05 19:36:12 +0900 |
| commit | b737282ac7fc127f6132815437bcc5a464101fd2 (patch) | |
| tree | 04497e11d18fd910609fdc1af180d3e5dccca0ed /db | |
| parent | 8fb7e87806e8ae94ee40e56400625886cbcf411e (diff) | |
| parent | 1d5f2f9c333534b7004501bcfa52ca873d6a3403 (diff) | |
| download | gitlab-ce-b737282ac7fc127f6132815437bcc5a464101fd2.tar.gz | |
Merge branch 'master' into refactor-clusters
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20150827121444_add_fast_forward_option_to_project.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/db/migrate/20150827121444_add_fast_forward_option_to_project.rb b/db/migrate/20150827121444_add_fast_forward_option_to_project.rb index 6f22641077d..35df121519e 100644 --- a/db/migrate/20150827121444_add_fast_forward_option_to_project.rb +++ b/db/migrate/20150827121444_add_fast_forward_option_to_project.rb @@ -8,7 +8,11 @@ class AddFastForwardOptionToProject < ActiveRecord::Migration disable_ddl_transaction! def up - add_column_with_default(:projects, :merge_requests_ff_only_enabled, :boolean, default: false) + # We put condition here because of a mistake we made a couple of years ago + # see https://gitlab.com/gitlab-org/gitlab-ce/issues/39382#note_45716103 + unless column_exists?(:projects, :merge_requests_ff_only_enabled) + add_column_with_default(:projects, :merge_requests_ff_only_enabled, :boolean, default: false) + end end def down |