From 4e4ff4958f135ce1e11d09196e28988a560e836f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 21 Jul 2016 17:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9changeset=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/changeset.rb                            | 3 +--
 db/migrate/20160718064146_add_type_to_changeset.rb | 6 ------
 lib/tasks/gitlab_act_project.rake                  | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 db/migrate/20160718064146_add_type_to_changeset.rb

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index a9c3687a1..149f4b163 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -57,7 +57,6 @@ class Changeset < ActiveRecord::Base
   validates :committed_on, presence: true
   validates :commit_date, presence: true
   validates :scmid, uniqueness: {scope: :repository_id, allow_nil: true}
-  attr_accessible :type, :project_id, :repository_id, :revision, :committer, :comments, :committed_on
   scope :visible, lambda {|*args|
     includes(:repository => :project).where(Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args))
   }
@@ -66,7 +65,7 @@ class Changeset < ActiveRecord::Base
   # after_update :be_user_score
   after_destroy :down_user_score
   # before_create :before_create_cs
-  after_create :act_as_forge_activity
+  # after_create :act_as_forge_activity
 
   
   def revision=(r)
diff --git a/db/migrate/20160718064146_add_type_to_changeset.rb b/db/migrate/20160718064146_add_type_to_changeset.rb
deleted file mode 100644
index 4d51883a1..000000000
--- a/db/migrate/20160718064146_add_type_to_changeset.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddTypeToChangeset < ActiveRecord::Migration
-  def change
-    add_column :changesets, :project_id, :integer
-    add_column :changesets, :type, :integer, :default => false
-  end
-end
diff --git a/lib/tasks/gitlab_act_project.rake b/lib/tasks/gitlab_act_project.rake
index 4ef4c4117..c4854db58 100644
--- a/lib/tasks/gitlab_act_project.rake
+++ b/lib/tasks/gitlab_act_project.rake
@@ -17,7 +17,7 @@ namespace :gitlab do
         (0..pages).each do |page|
           commits = g.commits(project.gpid, :ref_name => g_default_branch, :page => page)
           commits.each do |commit|
-            result = Commit.create(:project_id => project.id, :repository_id => project.gpid, :version => commit.id, :committer => commit.author_email, :comments => Redmine::CodesetUtil.to_utf8(commit.title, 'UTF-8'), :committed_on => commit.created_at)
+            Commit.create(:project_id => project.id, :repository_id => project.gpid, :version => commit.id, :committer => commit.author_email, :comments => Redmine::CodesetUtil.to_utf8(commit.title, 'UTF-8'), :committed_on => commit.created_at)
           end
         end
       rescue Exception => e