diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 09:40:20 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 09:40:20 +0300 |
commit | f8fe64a630b2adff8d260c7cc92f89ff8cfd0519 (patch) | |
tree | 19b2a2bc32c67e136273c986040cb456b6965488 /db | |
parent | e28fc7b1d366e044cd2f90fe54590966688709c5 (diff) | |
parent | 6ea35f98241b351747dd445738be58e3d65cafa2 (diff) |
Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
* upstream/master: (58 commits)
Fix icon name error
Rewrite system note helper
Change edit icon
Leave icon area blank if legacy note; remove diamond icon
Fix positioning of note icons
Fix newline errors
Add remaining system note icons
Add system notes icon helper; add icons
Fixed specs Updated JS that was causing the hints to appear & then disappear
Update tests
Fix broken spinach test
Reuse code
Improve shortcuts code
Adds ShortcutsDashboardNavigation to globals comment since its a global variable
Fix shortcut specs
Reorganize shortcut help menu
Change todos shortcut to shift
Change shortcuts
Switch global shortcuts to shift; reuse key styles from help menu
Map bindings to lowercase letters; only show key bindings when using keyboard shortcut
...
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20170124193147_add_two_factor_columns_to_namespaces.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20170124193147_add_two_factor_columns_to_namespaces.rb b/db/migrate/20170124193147_add_two_factor_columns_to_namespaces.rb index ca4429c676c..df5cddeb205 100644 --- a/db/migrate/20170124193147_add_two_factor_columns_to_namespaces.rb +++ b/db/migrate/20170124193147_add_two_factor_columns_to_namespaces.rb @@ -16,6 +16,6 @@ class AddTwoFactorColumnsToNamespaces < ActiveRecord::Migration remove_column(:namespaces, :require_two_factor_authentication) remove_column(:namespaces, :two_factor_grace_period) - remove_index(:namespaces, :require_two_factor_authentication) if index_exists?(:namespaces, :require_two_factor_authentication) + remove_concurrent_index(:namespaces, :require_two_factor_authentication) if index_exists?(:namespaces, :require_two_factor_authentication) end end |