Replace GitNotifications by Redmine watchers

Author: root

app/controllers/repository_git_notifications_controller.rb

@@ -2,33 +2,41 @@ module Gitolitable
   module Notifications
     extend ActiveSupport::Concern
 
-    def notifier
-      @notifier ||= ::GitNotifier.new(self)
+    def mailing_list
+      default_list + global_include_list - global_exclude_list
     end
 
 
     def default_list
-      notifier.default_list
+      watcher_users.map(&:email_address).map(&:address)
     end
 
 
-    def mail_mapping
-      notifier.mail_mapping
+    def global_include_list
+      RedmineGitHosting::Config.gitolite_notify_global_include
     end
 
 
-    def mailing_list
-      notifier.mailing_list
+    def global_exclude_list
+      RedmineGitHosting::Config.gitolite_notify_global_exclude
     end
 
 
     def sender_address
-      notifier.sender_address
+      if extra.notification_sender.nil? || extra.notification_sender.empty?
+        RedmineGitHosting::Config.gitolite_notify_global_sender_address
+      else
+        extra.notification_sender
+      end
     end
 
 
     def email_prefix
-      notifier.email_prefix
+      if extra.notification_prefix.nil? || extra.notification_prefix.empty?
+        RedmineGitHosting::Config.gitolite_notify_global_prefix
+      else
+        extra.notification_prefix
+      end
     end
 
   end

app/models/concerns/gitolitable/notifications.rb

@@ -14,7 +14,6 @@ class Repository::Xitolite < Repository::Git
 
   # Relations
   has_one  :extra,                  dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryGitExtra'
-  has_one  :git_notification,       dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryGitNotification'
   has_many :mirrors,                dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryMirror'
   has_many :post_receive_urls,      dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryPostReceiveUrl'
   has_many :deployment_credentials, dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryDeploymentCredential'
@@ -26,6 +25,7 @@ class Repository::Xitolite < Repository::Git
   # Additionnal validations
   validate :valid_repository_options, on: :create
 
+  acts_as_watchable
 
   class << self
 

app/models/repository/xitolite.rb

@@ -24,16 +24,18 @@ class RepositoryGitExtra < ActiveRecord::Base
   }
 
   ## Attributes
-  attr_accessible :git_http, :git_daemon, :git_notify, :git_annex, :default_branch, :protected_branch, :public_repo, :key, :urls_order
+  attr_accessible :git_http, :git_daemon, :git_notify, :git_annex, :default_branch, :protected_branch,
+                  :public_repo, :key, :urls_order, :notification_sender, :notification_prefix
 
   ## Relations
   belongs_to :repository
 
   ## Validations
-  validates :repository_id,  presence: true, uniqueness: true
-  validates :git_http,       presence: true, numericality: { only_integer: true }, inclusion: { in: [DISABLED, HTTP, HTTPS, BOTH] }
-  validates :default_branch, presence: true
-  validates :key,            presence: true
+  validates :repository_id,       presence: true, uniqueness: true
+  validates :git_http,            presence: true, numericality: { only_integer: true }, inclusion: { in: [DISABLED, HTTP, HTTPS, BOTH] }
+  validates :default_branch,      presence: true
+  validates :key,                 presence: true
+  validates :notification_sender, format: { with: RedmineGitHosting::Validators::EMAIL_REGEX, allow_blank: true }
 
   validate :validate_urls_order
 

app/models/repository_git_extra.rb

@@ -5,9 +5,6 @@
       - if User.current.git_allowed_to?(:view_repository_deployment_credentials, @repository)
         %li{ id: 'tab-repository_deployment_credentials' }= link_to label_with_icon(l(:label_deployment_credentials), 'fa-lock'), repository_deployment_credentials_path(@repository)
 
-      - if User.current.git_allowed_to?(:view_repository_git_notifications, @repository)
-        %li{ id: 'tab-repository_git_notifications' }= link_to label_with_icon(l(:label_git_notifications), 'fa-bullhorn'), repository_git_notifications_path(@repository)
-
       - if User.current.git_allowed_to?(:view_repository_mirrors, @repository)
         %li{ id: 'tab-repository_mirrors' }= link_to label_with_icon(l(:label_repository_mirrors), 'fa-cloud-upload'), repository_mirrors_path(@repository)
 

app/models/repository_git_notification.rb

@@ -0,0 +1,36 @@
+<% content_for :header_tags do %>
+  <%= javascript_include_tag 'repository_navigation' %>
+<% end %>
+
+<%= watcher_link(@repository, User.current) %>
+|
+<%= link_to l(:label_statistics),
+            {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
+            :class => 'icon icon-stats' if @repository.supports_all_revisions? %>
+
+<%= form_tag({:action => controller.action_name,
+             :id => @project,
+             :repository_id => @repository.identifier_param,
+             :path => to_path_param(@path),
+             :rev => nil},
+            {:method => :get, :id => 'revision_selector'}) do -%>
+  <!-- Branches Dropdown -->
+  <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
+    | <%= l(:label_branch) %>:
+    <%= select_tag :branch,
+                   options_for_select([''] + @repository.branches, @rev),
+                   :id => 'branch' %>
+  <% end -%>
+
+  <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
+    | <%= l(:label_tag) %>:
+    <%= select_tag :tag,
+                   options_for_select([''] + @repository.tags, @rev),
+                   :id => 'tag' %>
+  <% end -%>
+
+  <% if @repository.supports_all_revisions? %>
+    | <%= l(:label_revision) %>:
+    <%= text_field_tag 'rev', @rev, :size => 8 %>
+  <% end %>
+<% end -%>

app/services/git_notifier.rb

@@ -4,5 +4,8 @@
       = link_to_repository(repo, @repository)
       = link_to "(#{l(:label_settings)})", edit_repository_path(repo) if User.current.allowed_to?(:manage_repository, @project)
 
+- if User.current.allowed_to?(:add_issue_watchers, @project) || (@repository.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project))
+  #watchers= render 'watchers/watchers', watched: @repository
+
 :javascript
   $(document).ready(function() { $('#sidebar p').remove(); });