Automatic merge of gitlab-org/gitlab-ce master

app/helpers/storage_helper.rb

@@ -2,6 +2,8 @@
 
 module StorageHelper
   def storage_counter(size_in_bytes)
+    return s_('StorageSize|Unknown') unless size_in_bytes
+
     precision = size_in_bytes < 1.megabyte ? 0 : 1
 
     number_to_human_size(size_in_bytes, delimiter: ',', precision: precision, significant: false)

app/views/admin/projects/_projects.html.haml

@@ -13,7 +13,7 @@
 
           .stats
             %span.badge.badge-pill
-              = storage_counter(project.statistics.storage_size)
+              = storage_counter(project.statistics&.storage_size)
             - if project.archived
               %span.badge.badge-warning archived
           .title

app/views/admin/projects/show.html.haml

@@ -74,10 +74,10 @@
 
           %li
             %span.light= _('Storage:')
-            %strong= storage_counter(@project.statistics.storage_size)
-            (
-            = storage_counters_details(@project.statistics)
-            )
+            %strong= storage_counter(@project.statistics&.storage_size)
+            - if @project.statistics
+              = surround '(', ')' do
+                = storage_counters_details(@project.statistics)
 
           %li
             %span.light last commit:

changelogs/unreleased/49915-fix-error-500-admin-projects-nil-storage.yml

+---
+title: Fix an error in projects admin when statistics are missing
+merge_request: 28355
+author:
+type: fixed

changelogs/unreleased/fix-db-migrate-is-failed-on-mysql8.yml

+---
+title: Fix. `db:migrate` is failed on MySQL 8
+merge_request: 28351
+author: sue445
+type: fixed

db/migrate/20150509180749_convert_legacy_reference_notes.rb

@@ -7,7 +7,8 @@
 #   mentioned in 54f7727c850972f0401c1312a7c4a6a380de5666
 class ConvertLegacyReferenceNotes < ActiveRecord::Migration[4.2]
   def up
-    execute %q{UPDATE notes SET note = trim(both '_' from note) WHERE system = true AND note LIKE '\_%\_'}
+    quoted_column_name = ActiveRecord::Base.connection.quote_column_name('system')
+    execute %Q{UPDATE notes SET note = trim(both '_' from note) WHERE #{quoted_column_name} = true AND note LIKE '\_%\_'}
   end
 
   def down

spec/features/admin/admin_sees_project_statistics_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe "Admin > Admin sees project statistics" do
+  let(:current_user) { create(:admin) }
+
+  before do
+    sign_in(current_user)
+
+    visit admin_project_path(project)
+  end
+
+  context 'when project has statistics' do
+    let(:project) { create(:project, :repository) }
+
+    it "shows project statistics" do
+      expect(page).to have_content("Storage: 0 Bytes (0 Bytes repositories, 0 Bytes build artifacts, 0 Bytes LFS)")
+    end
+  end
+
+  context 'when project has no statistics' do
+    let(:project) { create(:project, :repository) { |project| project.statistics.destroy } }
+
+    it "shows 'Storage: Unknown'" do
+      expect(page).to have_content("Storage: Unknown")
+    end
+  end
+end

spec/features/admin/admin_sees_projects_statistics_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe "Admin > Admin sees projects statistics" do
+  let(:current_user) { create(:admin) }
+
+  before do
+    create(:project, :repository)
+    create(:project, :repository) { |project| project.statistics.destroy }
+
+    sign_in(current_user)
+
+    visit admin_projects_path
+  end
+
+  it "shows project statistics for projects that have them" do
+    expect(page.all('.stats').map(&:text)).to contain_exactly("0 Bytes", "Unknown")
+  end
+end