diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 03:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 03:08:01 +0300 |
| commit | 1caa60060b2f9e3417ab335e2f1dea1064163434 (patch) | |
| tree | 01c0d5825bd345ee625bb70b7433c6e10307fcce /db/migrate/20180515005612_add_squash_to_merge_requests.rb | |
| parent | 7f8330873c1a5860b8a9a52d111083a65d210249 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/migrate/20180515005612_add_squash_to_merge_requests.rb')
| -rw-r--r-- | db/migrate/20180515005612_add_squash_to_merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20180515005612_add_squash_to_merge_requests.rb b/db/migrate/20180515005612_add_squash_to_merge_requests.rb index 14636d6fd8e..dd301d22614 100644 --- a/db/migrate/20180515005612_add_squash_to_merge_requests.rb +++ b/db/migrate/20180515005612_add_squash_to_merge_requests.rb @@ -10,7 +10,7 @@ class AddSquashToMergeRequests < ActiveRecord::Migration[4.2] def up unless column_exists?(:merge_requests, :squash) # rubocop:disable Migration/UpdateLargeTable - add_column_with_default :merge_requests, :squash, :boolean, default: false, allow_null: false + add_column_with_default :merge_requests, :squash, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault end end |