Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/controllers/repositories_controller.rb

@@ -709,8 +709,10 @@ update
     commits_by_author.each do |cba|
       all_author << cba.first
     end
-    all_author = all_author.collect {|c| c.gsub(%r{<.+@.+>}, '') }
-    commits_by_author = repository.commits(all_author, @date_from, @date_to)
+    # all_author = all_author.collect {|c| c.gsub(%r{/ /<.+@.+>}, '') }
+    all_author = all_author.collect {|c| c.split.first }
+    commits_by_author = repository.commits(all_author, "2015-01-24", "2015-07-24")
+    Rails.logger.debug "######################################{commits_by_author}"
 
     fields = commits_by_author.collect {|r| r.first}
     commits_data = commits_by_author.collect {|r| r.last}
@@ -729,7 +731,7 @@ update
         :scale_integers => true,
         :show_data_values => true,
         :rotate_y_labels => false,
-        :graph_title => l(:label_author_commits_six_month),
+        :graph_title => l(:label_author_code_six_month),
         :show_graph_title => true
     )
     graph.add_data(