diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py index eb6d50d3e131eb..f5133844ac23cb 100644 --- a/src/sentry/conf/server.py +++ b/src/sentry/conf/server.py @@ -791,8 +791,6 @@ def create_partitioned_queues(name): 'organizations:event-attachments': False, # Enable the organization wide events stream interface. 'organizations:global-views': False, - # Enable the interface and functionality for unmerging event groups. - 'organizations:group-unmerge': False, # Enable integration functionality to create and link groups to issues on # external services. 'organizations:integrations-issue-basic': False, diff --git a/src/sentry/features/__init__.py b/src/sentry/features/__init__.py index 989a9a75cf38b9..bf29b650751f01 100644 --- a/src/sentry/features/__init__.py +++ b/src/sentry/features/__init__.py @@ -55,7 +55,6 @@ default_manager.add('organizations:discover', OrganizationFeature) # NOQA default_manager.add('organizations:event-attachments', OrganizationFeature) # NOQA default_manager.add('organizations:global-views', OrganizationFeature) # NOQA -default_manager.add('organizations:group-unmerge', OrganizationFeature) # NOQA default_manager.add('organizations:integrations-issue-basic', OrganizationFeature) # NOQA default_manager.add('organizations:integrations-issue-sync', OrganizationFeature) # NOQA default_manager.add('organizations:internal-catchall', OrganizationFeature) # NOQA diff --git a/src/sentry/static/sentry/app/views/groupDetails/header.jsx b/src/sentry/static/sentry/app/views/groupDetails/header.jsx index a06bec357b08fa..ec3d0b2222df19 100644 --- a/src/sentry/static/sentry/app/views/groupDetails/header.jsx +++ b/src/sentry/static/sentry/app/views/groupDetails/header.jsx @@ -68,7 +68,6 @@ const GroupHeader = createReactClass({ render() { let group = this.props.group, - orgFeatures = new Set(this.getOrganization().features), projectFeatures = this.getProjectFeatures(), userCount = group.userCount; @@ -93,7 +92,6 @@ const GroupHeader = createReactClass({ let message = this.getMessage(); let hasSimilarView = projectFeatures.has('similarity-view'); - let hasMergeView = orgFeatures.has('group-unmerge'); return (