diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-11 12:32:56 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-12 10:37:22 +0000 |
| commit | 520fbcc62d94b2ef7ab12403346d477c20e43f38 (patch) | |
| tree | dbfe77e78cc8c74799394710fe0e0caa4656fbde /db | |
| parent | 8130563101d343c19837bc520da6f1109d510cc7 (diff) | |
| download | gitlab-ce-520fbcc62d94b2ef7ab12403346d477c20e43f38.tar.gz | |
Merge branch 'restore-hipchat' into 'master'
Revert "Remove HipChat integration from GitLab"
Closes #60042
See merge request gitlab-org/gitlab-ce!27172
(cherry picked from commit 0276b8682e37d361adbd1ac89d9ba6992f0d1b60)
cd9ae6bb Revert "Remove HipChat integration from GitLab"
38d8616e Add changelog entry
69544c1e Fix UrlBlocker spec
e00c7016 Add frozen_string_literal to HipChat files
a409a77d Restore index on services.type
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20190107151029_remove_hipchat_services.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/db/migrate/20190107151029_remove_hipchat_services.rb b/db/migrate/20190107151029_remove_hipchat_services.rb deleted file mode 100644 index 4741ec88907..00000000000 --- a/db/migrate/20190107151029_remove_hipchat_services.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -# See http://doc.gitlab.com/ce/development/migration_style_guide.html -# for more information on how to write migrations for GitLab. - -class RemoveHipchatServices < ActiveRecord::Migration[5.0] - DOWNTIME = false - - def up - execute "DELETE FROM services WHERE type = 'HipchatService'" - end - - def down - # no-op - end -end |