Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

@@ -48,6 +48,9 @@ v 7.9.0 (unreleased)
   - Reject access to group/project avatar if the user doesn't have access.
   - Add database migration to clean group duplicates with same path and name (Make sure you have a backup before update)
   - Add GitLab active users count to rake gitlab:check
+  - Starred projects page at dashboard
+  - Make email display name configurable
+  - Improve json validation in hook data
 
 v 7.8.2
   - Fix service migration issue when upgrading from versions prior to 7.3

app/mailers/notify.rb

@@ -53,7 +53,7 @@ class Notify < ActionMailer::Base
   # The default email address to send emails from
   def default_sender_address
     address = Mail::Address.new(Gitlab.config.gitlab.email_from)
-    address.display_name = "GitLab"
+    address.display_name = Gitlab.config.gitlab.email_display_name
     address
   end
 

app/services/system_hooks_service.rb

@@ -41,7 +41,7 @@ class SystemHooksService
         path_with_namespace: model.path_with_namespace,
         project_id: model.id,
         owner_name: owner.name,
-        owner_email: owner.respond_to?(:email) ?  owner.email : nil,
+        owner_email: owner.respond_to?(:email) ?  owner.email : "",
         project_visibility: Project.visibility_levels.key(model.visibility_level_field).downcase
       })
     when User

config/gitlab.yml.example

@@ -43,6 +43,7 @@ production: &base
     # email_enabled: true
     # Email address used in the "From" field in mails sent by GitLab
     email_from: example@example.com
+    email_display_name: GitLab
 
     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
 

config/initializers/1_settings.rb

@@ -102,6 +102,7 @@ Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
 Settings.gitlab['protocol']   ||= Settings.gitlab.https ? "https" : "http"
 Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].nil?
 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
+Settings.gitlab['email_display_name'] ||= "GitLab"
 Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
 Settings.gitlab['user']       ||= 'git'
 Settings.gitlab['user_home']  ||= begin

lib/gitlab/push_data_builder.rb

@@ -58,6 +58,7 @@ module Gitlab
           data[:commits] << commit.hook_attrs(project)
         end
 
+        data[:commits] = "" if data[:commits].count == 0
         data
       end
 

spec/mailers/notify_spec.rb

@@ -5,6 +5,7 @@ describe Notify do
   include EmailSpec::Matchers
   include RepoHelpers
 
+  let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
   let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
   let(:recipient) { create(:user, email: 'recipient@example.com') }
   let(:project) { create(:project) }
@@ -23,7 +24,7 @@ describe Notify do
   shared_examples 'an email sent from GitLab' do
     it 'is sent from GitLab' do
       sender = subject.header[:from].addrs[0]
-      expect(sender.display_name).to eq('GitLab')
+      expect(sender.display_name).to eq(gitlab_sender_display_name)
       expect(sender.address).to eq(gitlab_sender)
     end
   end