summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-11-17 13:50:14 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-11-17 13:50:14 -0200
commitf4cf9d776af00cefd24be16c6aba6c37672dcc8d (patch)
tree84662a2645e3e77461bed7af332fad3525183f98
parentff186f8d3fa7b54e974a49e1eee7f47652d4a4cb (diff)
downloadgitlab-ce-feature/subscribe-to-group-level-labels.tar.gz
Remove extra subscribable_type filter on migrationfeature/subscribe-to-group-level-labels
-rw-r--r--db/migrate/20161031174110_migrate_subscriptions_project_id.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/db/migrate/20161031174110_migrate_subscriptions_project_id.rb b/db/migrate/20161031174110_migrate_subscriptions_project_id.rb
index 9e1bdb7c567..549145a0a65 100644
--- a/db/migrate/20161031174110_migrate_subscriptions_project_id.rb
+++ b/db/migrate/20161031174110_migrate_subscriptions_project_id.rb
@@ -10,7 +10,7 @@ class MigrateSubscriptionsProjectId < ActiveRecord::Migration
SET project_id = (
SELECT issues.project_id
FROM issues
- WHERE issues.id = subscriptions.subscribable_id AND subscriptions.subscribable_type = 'Issue'
+ WHERE issues.id = subscriptions.subscribable_id
)
WHERE subscriptions.subscribable_type = 'Issue';
EOF
@@ -20,7 +20,7 @@ class MigrateSubscriptionsProjectId < ActiveRecord::Migration
SET project_id = (
SELECT merge_requests.target_project_id
FROM merge_requests
- WHERE merge_requests.id = subscriptions.subscribable_id AND subscriptions.subscribable_type = 'MergeRequest'
+ WHERE merge_requests.id = subscriptions.subscribable_id
)
WHERE subscriptions.subscribable_type = 'MergeRequest';
EOF
@@ -30,7 +30,7 @@ class MigrateSubscriptionsProjectId < ActiveRecord::Migration
SET project_id = (
SELECT projects.id
FROM labels INNER JOIN projects ON projects.id = labels.project_id
- WHERE labels.id = subscriptions.subscribable_id AND subscriptions.subscribable_type = 'Label'
+ WHERE labels.id = subscriptions.subscribable_id
)
WHERE subscriptions.subscribable_type = 'Label';
EOF