diff options
author | Robert Speicher <robert@gitlab.com> | 2017-05-11 00:43:34 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-05-11 00:43:34 +0300 |
commit | cb2f739d4844af094f62edb4e4dff1b3413a405b (patch) | |
tree | c86ea111756a89d84e0601d554ddc78d3be780d0 /db | |
parent | 000045e6647fd8c2e28b1a6dc12ce59f9bfc054f (diff) | |
parent | 3db37e05622aa3daa2be41bb9edc486cd2e54bcd (diff) |
Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
Resolve "Use consistent style for trailing commas"
Closes #27144
See merge request !11063
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20160810142633_remove_redundant_indexes.rb | 2 | ||||
-rw-r--r-- | db/migrate/20160829114652_add_markdown_cache_columns.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/db/migrate/20160810142633_remove_redundant_indexes.rb b/db/migrate/20160810142633_remove_redundant_indexes.rb index d7ab022d7bc..ea7d1f9a436 100644 --- a/db/migrate/20160810142633_remove_redundant_indexes.rb +++ b/db/migrate/20160810142633_remove_redundant_indexes.rb @@ -69,7 +69,7 @@ class RemoveRedundantIndexes < ActiveRecord::Migration [:namespaces, 'index_namespaces_on_created_at_and_id'], [:notes, 'index_notes_on_created_at_and_id'], [:projects, 'index_projects_on_created_at_and_id'], - [:users, 'index_users_on_created_at_and_id'], + [:users, 'index_users_on_created_at_and_id'] ] transaction do diff --git a/db/migrate/20160829114652_add_markdown_cache_columns.rb b/db/migrate/20160829114652_add_markdown_cache_columns.rb index 9cb44dfa9f9..6ad7237f4cd 100644 --- a/db/migrate/20160829114652_add_markdown_cache_columns.rb +++ b/db/migrate/20160829114652_add_markdown_cache_columns.rb @@ -25,7 +25,7 @@ class AddMarkdownCacheColumns < ActiveRecord::Migration notes: [:note], projects: [:description], releases: [:description], - snippets: [:title, :content], + snippets: [:title, :content] }.freeze def change |