Merge branch 'ce-to-ee-2018-11-23' into 'master'

CE upstream - 2018-11-23 13:21 UTC

See merge request gitlab-org/gitlab-ee!8569

app/controllers/projects/blob_controller.rb

@@ -233,7 +233,7 @@ class Projects::BlobController < Projects::ApplicationController
 
   def validate_diff_params
     if [:since, :to, :offset].any? { |key| params[key].blank? }
-      render nothing: true
+      head :ok
     end
   end
 

app/controllers/projects/branches_controller.rb

@@ -105,7 +105,7 @@ class Projects::BranchesController < Projects::ApplicationController
         redirect_to project_branches_path(@project), status: :see_other
       end
 
-      format.js { render nothing: true, status: result[:return_code] }
+      format.js { head result[:return_code] }
       format.json { render json: { message: result[:message] }, status: result[:return_code] }
     end
   end

app/controllers/projects/merge_requests_controller.rb

@@ -215,7 +215,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   def rebase
     RebaseWorker.perform_async(@merge_request.id, current_user.id)
 
-    render nothing: true, status: :ok
+    head :ok
   end
 
   protected

app/helpers/issuables_helper.rb

@@ -362,6 +362,10 @@ module IssuablesHelper
     end
   end
 
+  def has_filter_bar_param?
+    finder.class.scalar_params.any? { |p| params[p].present? }
+  end
+
   private
 
   def sidebar_gutter_collapsed?

app/views/shared/empty_states/_issues.html.haml

@@ -8,7 +8,12 @@
       = image_tag 'illustrations/issues.svg'
   .col-12
     .text-content
-      - if current_user
+      - if has_filter_bar_param?
+        %h4.text-center
+          = _("Sorry, your filter produced no results")
+        %p.text-center
+          = _("To widen your search, change or remove filters above")
+      - elsif current_user
         %h4
           = _("The Issue Tracker is the place to add things that need to be improved or solved in a project")
         %p

app/views/shared/empty_states/_merge_requests.html.haml

@@ -8,16 +8,19 @@
       = image_tag 'illustrations/merge_requests.svg'
   .col-12
     .text-content
-      - if has_button
+      - if has_filter_bar_param?
+        %h4.text-center
+          = _("Sorry, your filter produced no results")
+        %p.text-center
+          = _("To widen your search, change or remove filters above")
+      - else
         %h4
           = _("Merge requests are a place to propose changes you've made to a project and discuss those changes with others")
         %p
           = _("Interested parties can even contribute by pushing commits if they want to.")
-        .text-center
-          - if project_select_button
-            = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _('New merge request'), type: :merge_requests, with_feature_enabled: 'merge_requests'
-          - else
-            = link_to _('New merge request'), button_path, class: 'btn btn-success', title: _('New merge request'), id: 'new_merge_request_link'
-      - else
-        %h4.text-center
-          = _("There are no merge requests to show")
+        - if has_button
+          .text-center
+            - if project_select_button
+              = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _('New merge request'), type: :merge_requests, with_feature_enabled: 'merge_requests'
+            - else
+              = link_to _('New merge request'), button_path, class: 'btn btn-success', title: _('New merge request'), id: 'new_merge_request_link'

changelogs/unreleased/53326-improve-issues-empty-state.yml

+---
+title: Show different empty state for filtered issues and MRs
+merge_request: 22775
+author: Heinrich Lee Yu
+type: changed

changelogs/unreleased/rails5-deprecation-render-nothing.yml

+---
+title: render :nothing option is deprecated, Use head method to respond with empty
+  response body.
+merge_request: 23311
+author: Jasper Maes
+type: other

config/application.rb

@@ -83,6 +83,12 @@ module Gitlab
     # config.i18n.default_locale = :de
     config.i18n.enforce_available_locales = false
 
+    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+    # the I18n.default_locale when a translation can not be found).
+    # We have to explicitly set default locale since 1.1.0 - see:
+    # https://github.com/svenfuchs/i18n/pull/415
+    config.i18n.fallbacks = [:en]
+
     # Translation for AR attrs is not working well for POROs like WikiPage
     config.gettext_i18n_rails.use_for_active_record_attributes = false
 

config/environments/production.rb

@@ -65,10 +65,6 @@ Rails.application.configure do
   # Enable threaded mode
   # config.threadsafe! unless $rails_rake_task
 
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
-
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 

locale/gitlab.pot

@@ -7645,6 +7645,9 @@ msgstr ""
 msgid "Sorry, no projects matched your search"
 msgstr ""
 
+msgid "Sorry, your filter produced no results"
+msgstr ""
+
 msgid "Sort by"
 msgstr ""
 
@@ -8160,9 +8163,6 @@ msgstr ""
 msgid "There are no labels yet"
 msgstr ""
 
-msgid "There are no merge requests to show"
-msgstr ""
-
 msgid "There are no projects shared with this group yet"
 msgstr ""
 
@@ -8641,6 +8641,9 @@ msgstr ""
 msgid "To view the roadmap, add a start or due date to one of your epics in this group or its subgroups. In the months view, only epics in the past month, current month, and next 5 months are shown."
 msgstr ""
 
+msgid "To widen your search, change or remove filters above"
+msgstr ""
+
 msgid "To widen your search, change or remove filters."
 msgstr ""
 

spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb

@@ -27,11 +27,11 @@ describe ControllerWithCrossProjectAccessCheck do
                                               if: -> { if_condition }
 
         def index
-          render nothing: true
+          head :ok
         end
 
         def show
-          render nothing: true
+          head :ok
         end
 
         def unless_condition
@@ -88,15 +88,15 @@ describe ControllerWithCrossProjectAccessCheck do
                                         if: -> { if_condition }
 
         def index
-          render nothing: true
+          head :ok
         end
 
         def show
-          render nothing: true
+          head :ok
         end
 
         def edit
-          render nothing: true
+          head :ok
         end
 
         def unless_condition

spec/controllers/concerns/lfs_request_spec.rb

@@ -10,7 +10,7 @@ describe LfsRequest do
     def show
       storage_project
 
-      render nothing: true
+      head :ok
     end
 
     def project

spec/features/issues_spec.rb

@@ -8,6 +8,17 @@ describe 'Issues' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
+  shared_examples_for 'empty state with filters' do
+    it 'user sees empty state with filters' do
+      create(:issue, author: user, project: project)
+
+      visit project_issues_path(project, milestone_title: "1.0")
+
+      expect(page).to have_content('Sorry, your filter produced no results')
+      expect(page).to have_content('To widen your search, change or remove filters above')
+    end
+  end
+
   describe 'while user is signed out' do
     describe 'empty state' do
       it 'user sees empty state' do
@@ -17,6 +28,8 @@ describe 'Issues' do
         expect(page).to have_content('The Issue Tracker is the place to add things that need to be improved or solved in a project.')
         expect(page).to have_content('You can register or sign in to create issues for this project.')
       end
+
+      it_behaves_like 'empty state with filters'
     end
   end
 
@@ -37,6 +50,8 @@ describe 'Issues' do
         expect(page).to have_content('Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable.')
         expect(page).to have_content('New issue')
       end
+
+      it_behaves_like 'empty state with filters'
     end
 
     describe 'Edit issue' do

spec/features/merge_request/user_sees_empty_state_spec.rb

@@ -19,12 +19,20 @@ describe 'Merge request > User sees empty state' do
   context 'if there are merge requests' do
     before do
       create(:merge_request, source_project: project)
-
-      visit project_merge_requests_path(project)
     end
 
     it 'does not show an empty state' do
+      visit project_merge_requests_path(project)
+
       expect(page).not_to have_selector('.empty-state')
     end
+
+    it 'shows empty state when filter results empty' do
+      visit project_merge_requests_path(project, milestone_title: "1.0")
+
+      expect(page).to have_selector('.empty-state')
+      expect(page).to have_content('Sorry, your filter produced no results')
+      expect(page).to have_content('To widen your search, change or remove filters above')
+    end
   end
 end