Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

2020-11-25 16:43:09 -06:00
parent b4e370d3d3 a9387c5167
commit 20d4fc09af
11 changed files with 66 additions and 30 deletions
--- a/app/javascript/gabsocial/components/popover/group_timeline_sort_top_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/group_timeline_sort_top_options_popover.js
@@ -56,12 +56,14 @@ class GroupTimelineSortTopOptionsPopover extends React.PureComponent {
        title: intl.formatMessage(messages.topYearTitle),
        onClick: () => this.handleOnClick(GROUP_TIMELINE_SORTING_TYPE_TOP_OPTION_YEARLY),
      },
+      /*
      {
        hideArrow: true,
        isActive: sortByTopValue === GROUP_TIMELINE_SORTING_TYPE_TOP_OPTION_ALL_TIME,
        title: intl.formatMessage(messages.topAllTitle),
        onClick: () => this.handleOnClick(GROUP_TIMELINE_SORTING_TYPE_TOP_OPTION_ALL_TIME),
      },
+      */
    ]

    return (