Revert "Merge branch 'filter-confidential-issues' into 'master'"

This reverts commit d133bf84c668df3dfc9938bb04150754cb873c8b, reversing
changes made to 7981c0292b07a0138b096fa082341fcb13e9ce2b.

6 files changed, 4 insertions, 86 deletions

diff --git a/spec/controllers/concerns/issuable_collections_spec.rb b/spec/controllers/concerns/issuable_collections_spec.rb
index 8580900215c..307c5d60c57 100644
--- a/spec/controllers/concerns/issuable_collections_spec.rb
+++ b/spec/controllers/concerns/issuable_collections_spec.rb
@@ -112,8 +112,7 @@ describe IssuableCollections do
         assignee_username: 'user1',
         author_id: '2',
         author_username: 'user2',
-        authorized_only: 'yes',
-        confidential: true,
+        authorized_only: 'true',
         due_date: '2017-01-01',
         group_id: '3',
         iids: '4',
@@ -141,7 +140,6 @@ describe IssuableCollections do
         'assignee_username' => 'user1',
         'author_id' => '2',
         'author_username' => 'user2',
-        'confidential' => true,
         'label_name' => 'foo',
         'milestone_title' => 'bar',
         'my_reaction_emoji' => 'thumbsup',
diff --git a/spec/features/issues/filtered_search/dropdown_hint_spec.rb b/spec/features/issues/filtered_search/dropdown_hint_spec.rb
index 096756f19cc..0e296ab2109 100644
--- a/spec/features/issues/filtered_search/dropdown_hint_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_hint_spec.rb
@@ -66,7 +66,7 @@ describe 'Dropdown hint', :js do
       it 'filters with text' do
         filtered_search.set('a')
 
-        expect(find(js_dropdown_hint)).to have_selector('.filter-dropdown .filter-dropdown-item', count: 5)
+        expect(find(js_dropdown_hint)).to have_selector('.filter-dropdown .filter-dropdown-item', count: 4)
       end
     end
 
@@ -119,15 +119,6 @@ describe 'Dropdown hint', :js do
         expect_tokens([{ name: 'my-reaction' }])
         expect_filtered_search_input_empty
       end
-
-      it 'opens the yes-no dropdown when you click on confidential' do
-        click_hint('confidential')
-
-        expect(page).to have_css(js_dropdown_hint, visible: false)
-        expect(page).to have_css('#js-dropdown-confidential', visible: true)
-        expect_tokens([{ name: 'confidential' }])
-        expect_filtered_search_input_empty
-      end
     end
 
     describe 'selecting from dropdown with some input' do
diff --git a/spec/features/issues/filtered_search/search_bar_spec.rb b/spec/features/issues/filtered_search/search_bar_spec.rb
index c4468922883..8abab3f35d6 100644
--- a/spec/features/issues/filtered_search/search_bar_spec.rb
+++ b/spec/features/issues/filtered_search/search_bar_spec.rb
@@ -100,7 +100,7 @@ describe 'Search bar', :js do
       find('.filtered-search-box .clear-search').click
       filtered_search.click
 
-      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 6)
+      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 5)
       expect(get_left_style(find('#js-dropdown-hint')['style'])).to eq(hint_offset)
     end
   end
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 47e2548c3d6..fe8000e419b 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -490,32 +490,6 @@ describe IssuesFinder do
         end
       end
 
-      context 'filtering by confidential' do
-        set(:confidential_issue) { create(:issue, project: project1, confidential: true) }
-
-        context 'no filtering' do
-          it 'returns all issues' do
-            expect(issues).to contain_exactly(issue1, issue2, issue3, issue4, confidential_issue)
-          end
-        end
-
-        context 'user filters confidential issues' do
-          let(:params) { { confidential: true } }
-
-          it 'returns only confdential issues' do
-            expect(issues).to contain_exactly(confidential_issue)
-          end
-        end
-
-        context 'user filters only public issues' do
-          let(:params) { { confidential: false } }
-
-          it 'returns only confdential issues' do
-            expect(issues).to contain_exactly(issue1, issue2, issue3, issue4)
-          end
-        end
-      end
-
       context 'when the user is unauthorized' do
         let(:search_user) { nil }
 
@@ -582,7 +556,7 @@ describe IssuesFinder do
     it 'returns the number of rows for the default state' do
       finder = described_class.new(user)
 
-      expect(finder.row_count).to eq(5)
+      expect(finder.row_count).to eq(4)
     end
 
     it 'returns the number of rows for a given state' do
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 6101df2e099..5d18e085a6f 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -765,15 +765,6 @@ describe Issue do
     end
   end
 
-  describe '.confidential_only' do
-    it 'only returns confidential_only issues' do
-      create(:issue)
-      confidential_issue = create(:issue, confidential: true)
-
-      expect(described_class.confidential_only).to eq([confidential_issue])
-    end
-  end
-
   it_behaves_like 'throttled touch' do
     subject { create(:issue, updated_at: 1.hour.ago) }
   end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 1a4be2bd30f..d10ee6cc320 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -183,18 +183,6 @@ describe API::Issues do
         expect_paginated_array_response([issue.id, confidential_issue.id, closed_issue.id])
       end
 
-      it 'returns only confidential issues' do
-        get api('/issues', user), params: { confidential: true, scope: 'all' }
-
-        expect_paginated_array_response(confidential_issue.id)
-      end
-
-      it 'returns only public issues' do
-        get api('/issues', user), params: { confidential: false }
-
-        expect_paginated_array_response([issue.id, closed_issue.id])
-      end
-
       it 'returns issues reacted by the authenticated user' do
         issue2 = create(:issue, project: project, author: user, assignees: [user])
         create(:award_emoji, awardable: issue2, user: user2, name: 'star')
@@ -569,18 +557,6 @@ describe API::Issues do
         expect_paginated_array_response([group_confidential_issue.id, group_issue.id])
       end
 
-      it 'returns only confidential issues' do
-        get api(base_url, user), params: { confidential: true }
-
-        expect_paginated_array_response(group_confidential_issue.id)
-      end
-
-      it 'returns only public issues' do
-        get api(base_url, user), params: { confidential: false }
-
-        expect_paginated_array_response([group_closed_issue.id, group_issue.id])
-      end
-
       it 'returns an array of labeled group issues' do
         get api(base_url, user), params: { labels: group_label.title }
 
@@ -806,18 +782,6 @@ describe API::Issues do
       expect_paginated_array_response([issue.id, confidential_issue.id, closed_issue.id])
     end
 
-    it 'returns only confidential issues' do
-      get api("#{base_url}/issues", author), params: { confidential: true }
-
-      expect_paginated_array_response(confidential_issue.id)
-    end
-
-    it 'returns only public issues' do
-      get api("#{base_url}/issues", author), params: { confidential: false }
-
-      expect_paginated_array_response([issue.id, closed_issue.id])
-    end
-
     it 'returns project confidential issues for assignee' do
       get api("#{base_url}/issues", assignee)