Merge branch '7-14-stable' into 7-14-stable-ee

CHANGELOG

@@ -3,6 +3,8 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 7.14.1
   - Only include base URL in OmniAuth full_host parameter (Stan Hu)
   - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu)
+  - Fix "Reload with full diff" URL button in compare branch view (Stan Hu)
+  - Improve abuse reports management from admin area
 v 7.14.0
   - Fix bug where non-project members of the target project could set labels on new merge requests.

app/assets/javascripts/application.js.coffee

@@ -118,6 +118,12 @@ $ ->
   $('.remove-row').bind 'ajax:success', ->
     $(this).closest('li').fadeOut()
+  $('.js-remove-tr').bind 'ajax:before', ->
+    $(this).hide()
+
+  $('.js-remove-tr').bind 'ajax:success', ->
+    $(this).closest('tr').fadeOut()
+
   # Initialize select2 selects
   $('select.select2').select2(width: 'resolve', dropdownAutoWidth: true)

app/controllers/admin/abuse_reports_controller.rb

@@ -4,8 +4,13 @@ def index
   end
   def destroy
-    AbuseReport.find(params[:id]).destroy
-    redirect_to admin_abuse_reports_path, notice: 'Report was removed'
+    abuse_report = AbuseReport.find(params[:id])
+    if params[:remove_user]
+      abuse_report.user.destroy
+    end
+
+    abuse_report.destroy
+    render nothing: true
   end
 end

app/views/admin/abuse_reports/_abuse_report.html.haml

@@ -3,7 +3,7 @@
 %tr
   %td
     - if reporter
-      = link_to reporter.name, [:admin, reporter]
+      = link_to reporter.name, reporter
     - else
       (removed)
   %td
@@ -12,12 +12,15 @@
     = abuse_report.message
   %td
     - if user
-      = link_to user.name, [:admin, user]
+      = link_to user.name, user
     - else
       (removed)
   %td
     - if user
-      = link_to 'Block', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs btn-warning"
-      = link_to 'Remove user', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-xs btn-remove"
+      = link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true),
+        data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, remote: true, method: :delete, class: "btn btn-xs btn-remove js-remove-tr"
+
   %td
-    = link_to 'Remove report', [:admin, abuse_report], method: :delete, class: "btn btn-xs btn-close"
+    - if user
+      = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs"
+    = link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"

app/views/admin/abuse_reports/index.html.haml

@@ -9,7 +9,7 @@
         %th Reported at
         %th Message
         %th User
-        %th
+        %th Primary action
         %th
     = render @abuse_reports
   = paginate @abuse_reports

app/views/projects/diffs/_warning.html.haml

@@ -3,7 +3,7 @@
     Too many changes to show.
     .pull-right
       - unless diff_hard_limit_enabled?
-        = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: :html)), class: "btn btn-sm btn-warning"
+        = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: nil)), class: "btn btn-sm btn-warning"
       - if current_controller?(:commit) or current_controller?(:merge_requests)
         - if current_controller?(:commit)

features/project/commits/commits.feature

@@ -41,6 +41,7 @@ Feature: Project Commits
   Scenario: I browse big commit
     Given I visit big commit page
     Then I see big commit warning
+    And I see "Reload with full diff" link
   Scenario: I browse a commit with an image
     Given I visit a commit with an image that changed

features/steps/project/commits/commits.rb

@@ -79,6 +79,12 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
     expect(page).to have_content "Too many changes"
   end
+  step 'I see "Reload with full diff" link' do
+    link = find_link('Reload with full diff')
+    expect(link[:href]).to end_with('?force_show_diff=true')
+    expect(link[:href]).not_to include('.html')
+  end
+
   step 'I visit a commit with an image that changed' do
     visit namespace_project_commit_path(@project.namespace, @project, sample_image_commit.id)
   end