Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/sentry/conf/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion src/sentry/features/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions src/sentry/static/sentry/app/views/groupDetails/header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -93,7 +92,6 @@ const GroupHeader = createReactClass({
let message = this.getMessage();

let hasSimilarView = projectFeatures.has('similarity-view');
let hasMergeView = orgFeatures.has('group-unmerge');

return (
<div className={className}>
Expand Down Expand Up @@ -201,11 +199,9 @@ const GroupHeader = createReactClass({
<ListLink to={`/${orgId}/${projectId}/issues/${groupId}/events/`}>
{t('Events')}
</ListLink>
{hasMergeView && (
<ListLink to={`/${orgId}/${projectId}/issues/${groupId}/merged/`}>
{t('Merged')}
</ListLink>
)}
<ListLink to={`/${orgId}/${projectId}/issues/${groupId}/merged/`}>
{t('Merged')}
</ListLink>
{hasSimilarView && (
<ListLink to={`/${orgId}/${projectId}/issues/${groupId}/similar/`}>
{t('Similar Issues')}
Expand Down