From 537cc20e06754a7e04196de3674c53a72629009b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 22 Jul 2016 10:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2repository=5Fid=E4=B8=BA=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=EF=BC=8Cversion=E5=94=AF=E4=B8=80=E6=80=A7=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/commit.rb                    | 3 +++
 lib/tasks/gitlab_forge_acts_update.rake | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 246b8be0c..a6633206a 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -1,5 +1,8 @@
 class Commit < ActiveRecord::Base
   attr_accessible :comments, :committed_on, :committer, :project_id, :repository_id, :version
+  validates :repository_id, presence: true
+  validates :version, presence: true, uniqueness: {scope: :repository_id}
+  validates :committed_on, presence: true
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   after_create :act_as_forge_activity
 
diff --git a/lib/tasks/gitlab_forge_acts_update.rake b/lib/tasks/gitlab_forge_acts_update.rake
index 2248f3b87..4d8e9b2fb 100644
--- a/lib/tasks/gitlab_forge_acts_update.rake
+++ b/lib/tasks/gitlab_forge_acts_update.rake
@@ -5,8 +5,8 @@ namespace :gitlab do
     ids = [2,847,931,942]
     projects = Project.find(ids)
     projects.each do |project|
-      c = Commit.where(:project_id => project.id)
-      if c.blank?
+      # c = Commit.where(:project_id => project.id)
+      # if c.blank?
         begin
           g_project = g.project(project.gpid)
           # 获取默认分支
@@ -26,7 +26,7 @@ namespace :gitlab do
         rescue Exception => e
           puts e
         end
-      end
+      # end
     end
   end
 end