Merge branch 'gitlab_guange' into szzh

app/controllers/repositories_controller.rb

@@ -34,7 +34,7 @@ class RepositoriesController < ApplicationController
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -42,7 +42,7 @@ class RepositoriesController < ApplicationController
   include RepositoriesHelper
   helper :project_score
   #@root_path = RepositoriesHelper::ROOT_PATH
-
+  $g=Gitlab.client
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
@@ -63,6 +63,78 @@ class RepositoriesController < ApplicationController
 
   end
 
+  def forked
+    # 被forked的标识如果不满足单个用户唯一性，则不执行fork
+    if is_sigle_identifier?(User.current, @repository.identifier)
+      # REDO: 那些人有权限forked项目
+      g = Gitlab.client
+      gproject = g.post ("/projects/fork/#{@project.gpid}?user_id=#{User.current.gid}")
+      if gproject
+        copy_project(@project, gproject)
+      end
+    else
+      flash[:notice] = l(:project_gitlab_fork_double_message)
+      redirect_to settings_project_url(@project, :tab => 'repositories')
+    end
+  end
+
+  # copy a project for fork
+  def copy_project(project, gproject)
+    project = Project.new
+    project.name = @project.name
+    project.is_public = @project.is_public
+    project.status = @project.status
+    project.description = @project.description
+    project.hidden_repo = @project.hidden_repo
+    project.user_id = User.current.id
+    project.project_type = 0
+    project.project_new_type = @project.project_new_type
+    project.gpid = gproject.id
+    if project.save
+      r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+      m = Member.new(:user => User.current, :roles => [r])
+      project_info = ProjectInfo.new(:user_id => User.current.id, :project_id => project.id)
+      user_grades =  UserGrade.create(:user_id => User.current.id, :project_id => project.id)
+      Rails.logger.debug "UserGrade created: #{user_grades.to_json}"
+      project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0, :project_type => @project.project_type,:grade => 0)
+      Rails.logger.debug "ProjectStatus created: #{project_status.to_json}"
+      project.members << m
+      project.project_infos << project_info
+      copy_repository(project, gproject)
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_create)
+          if params[:continue]
+            attrs = {:parent_id => project.parent_id}.reject {|k,v| v.nil?}
+            redirect_to new_project_url(attrs, :course => '0')
+          else
+            redirect_to settings_project_url(project)
+          end
+        }
+        format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => project.id) }
+        format.js
+      end
+    else
+      respond_to do |format|
+        format.html { render :action => 'forked', :layout => 'base_projects'}
+        format.api  { render_validation_errors(@project) }
+      end
+    end
+  end
+
+  def copy_repository(project, gproject)
+    # 避免
+    if is_sigle_identifier?(project.user_id, gproject.name)
+      repository = Repository.factory('Git')
+      repository.project_id = project.id
+      repository.type = 'Repository::Gitlab'
+      repository.url = gproject.name
+      repository.identifier = gproject.name
+      repository = repository.save
+    else
+      flash[:notice] = l(:project_gitlab_create_double_message)
+    end
+  end
 
   def newrepo
     scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
@@ -115,6 +187,11 @@ update
   }
 
   def create
+    # 判断版本库创建者是否有同名版本库，避免版本库路径一致问题
+    unless is_sigle_identifier?(@project.user_id, params[:repository].first[1])
+      flash[:notice] = l(:project_gitlab_create_double_message)
+      redirect_to settings_project_url(@project, :tab => 'repositories')
+    else
       attrs = pickup_extra_info
       @repository = Repository.factory('Git')
       @repository.safe_attributes = params[:repository]
@@ -132,6 +209,7 @@ update
         redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages)
       end
     end
+  end
 
   def edit
   end
@@ -237,14 +315,34 @@ update
       #Modified by young
       #  (show_error_not_found; return) unless @entries
       g = Gitlab.client
-      count = 0
+
-      (0..100).each do |page|
+      # count = 0
-        if g.commits(@project.gpid,:page => page).count == 0
+      # (0..100).each do |page|
-          break
+      #   if g.commits(@project.gpid,:page => page).count == 0
+      #     break
+      #   else
+      #     count = count + g.commits(@project.gpid,:page => page).count
+      #   end
+      # end
+
+
+      #add by hx
+      if g.commits(@project.gpid , :page=>25).count==0
+        count = count_commits(@project.gpid , 0 , 25)
+      elsif g.commits(@project.gpid , :page=>50).count ==0
+        count = count_commits(@project.gpid , 25 , 50)+ 25 * 20
+      elsif g.commits(@project.gpid , :page=>75).count ==0
+        count = count_commits(@project.gpid , 50 , 75)+ 50 * 20
+      elsif g.commits(@project.gpid , :page=>100).count== 0
+        count = count_commits(@project.gpid , 75 , 100) + 75 * 20
+      elsif g.commits(@project.gpid , :page=>125).count==0
+        count = count_commits(@project.gpid , 100 , 125) + 100 * 20
+      elsif g.commits(@project.gpid , :page=>150).count==0
+        count = count_commits(@project.gpid , 125 , 150) + 125 * 20
       else
-          count = count + g.commits(@project.gpid,:page => page).count
+        count = count_commits(@project.gpid , 150 ,200) + 150 * 20
-        end
       end
+
       @changesets = g.commits(@project.gpid)
       # @changesets = @repository.latest_changesets(@path, @rev)
       # @changesets_count = @repository.latest_changesets(@path, @rev).count
@@ -271,11 +369,30 @@ update
 
   alias_method :browse, :show
 
+  #add by hx
+  def count_commits(project_id , left , right)
+    count = 0
+    (left..right).each do |page|
+      if $g.commits(project_id,:page => page).count == 0
+        break
+      else
+        count = count + $g.commits(project_id,:page => page).count
+      end
+    end
+    return count
+  end
+
   def changes
     @entry = @repository.entry(@path, @rev)
     (show_error_not_found; return) unless @entry
     g = Gitlab.client
-    @commits = g.commits(@project.gpid, page:params[:pamge])
+    limit = 20
+    #每次页面的换回值从1开始,但是gitlab的页面查询是从0开始,所以先改变page的类型减一在改回来
+    @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
+    #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
+    @commits_count = params[:commit_count].to_i
+    @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]
+
     @commit = g.commit(@project.gpid,@rev)
     # @changesets = g.get ("/projects/#{@project.gpid}/repository/commits?#{@rev}")
     #@changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
@@ -284,6 +401,7 @@ update
     render :layout => 'base_projects'
   end
 
+
   def revisions
     @changeset_count = @repository.changesets.count
     @changeset_pages = Paginator.new @changeset_count,

app/controllers/student_work_controller.rb

@@ -168,9 +168,15 @@ class StudentWorkController < ApplicationController
 
   def create
     # 提交作品前先判断是否已经提交
+    @has_commit = false;
     if hsd_committed_work?(User.current.id, @homework.id)
-      flash[:notice] = l(:notice_successful_create)
+      @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
-      redirect_to edit_student_work_url(params[:student_work])
+      @has_commit = true;
+      #flash[:notice] = l(:notice_successful_create)
+      #redirect_to edit_student_work_url(params[:student_work])
+      respond_to do |format|
+        format.js
+      end
       return
     end
     if params[:student_work]

app/helpers/repositories_helper.rb

@@ -27,6 +27,20 @@ module RepositoriesHelper
   REPO_IP_ADDRESS = Setting.host_repository
   REPO_GITLAB_ADDRESS = "git.trustie.net"
 
+  # 某个成员不能拥有同名版本库，不同的成员可以创建同名版本库
+  def is_sigle_identifier?(user_id, iden)
+    projects = Project.where("user_id =?",user_id)
+    identifiers = []
+    projects.each do |project|
+      # 只针对gitlab类型的，git类型的后期清掉
+      repository = Repository.where("project_id =? and type =?", project.id, "Repository::Gitlab").first
+      if repository
+        identifiers << repository.identifier
+      end
+    end
+    identifiers.include?(iden) ? false :true
+  end
+
   def format_revision(revision)
     if revision.respond_to? :format_identifier
       revision.format_identifier
@@ -47,7 +61,7 @@ module RepositoriesHelper
 
   def user_commit_rep(mail)
     user = User.find_by_mail(mail)
-    user.nil? ? User.find(2) :  User.find_by_mail(mail)
+    #user.nil? ? User.find(2) :  User.find_by_mail(mail)
   end
 
   def render_properties(properties)

app/models/repository.rb

@@ -40,7 +40,8 @@ class Repository < ActiveRecord::Base
   validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH, :allow_blank => true
   validates_presence_of :identifier#, :unless => Proc.new { |r| r.is_default? || r.set_as_default? }
   #validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true
-  validates_uniqueness_of :identifier, :allow_blank => true
+  # 改成同一用户不能有两个相同名字的版本库
+  # validates_uniqueness_of :identifier, :allow_blank => true
   validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
   # donwcase letters, digits, dashes, underscores but not digits only
   validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true
@@ -52,7 +53,8 @@ class Repository < ActiveRecord::Base
     'password',
     'path_encoding',
     'log_encoding',
-    'is_default'
+    'is_default',
+    'type'
 
   safe_attributes 'url',
     :if => lambda {|repository, user| repository.new_record?}
@@ -63,6 +65,10 @@ class Repository < ActiveRecord::Base
   end
 
   def repo_create_validation
+    # 之所以可以这样改，是因为Fork的时候不需要从Trustie创建版本库，只需从Gitlab关联即可
+    if self.class.name.demodulize == "Repository"
+      return
+    end
     unless Setting.enabled_scm.include?(self.class.name.demodulize)
       errors.add(:type, :invalid)
     end

app/views/projects/_development_group.html.erb

@@ -47,7 +47,7 @@
     <% else %>
         <%= link_to l(:project_module_repository),({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).identifier}), :class => "f14 c_blue02" %>
     <% end %>
-    <a class="subnav_num">(<%= @project.repositories.count %>)</a>
+    <!--<a class="subnav_num">(<%= @project.repositories.count %>)</a>-->
     <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %>
         <%= link_to "+"+l(:project_gitlab_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
     <% end %>

app/views/repositories/_breadcrumbs.html.erb

@@ -1,12 +1,12 @@
 <div class="git_usr_title">
+  <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %>
+  /
   <span><%= link_to @repository.identifier.present? ? h(@repository.identifier) : 'root',
                     {:action => 'show', :id => @project,
                      :repository_id => @repository.identifier_param,
                      :path => nil, :rev => @rev },
                      :class => "repository-title-dec"
   %>
-    /
-    <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %>
   </span>
 </div>
 

app/views/repositories/_revisions.html.erb

@@ -13,6 +13,7 @@
         <!--<th><%= l(:field_comments) %></th>-->
       <!--</tr></thead>-->
       <tbody>
+
       <% show_diff = revisions.size > 1 %>
       <% line_num = 1 %>
       <% revisions.each do |changeset| %>
@@ -48,4 +49,9 @@
       <%#= submit_tag(l(:label_view_diff), :name => nil, :class=>"c_blue") if show_diff %>
     </p>
 
+    <ul class="wlist">
+      <%= pagination_links_full commits_pages, commits_count, :per_page_links => false, :remote => false, :flag => true%>
+    </ul>
+
 <% end %>
+

app/views/repositories/changes.html.erb

@@ -14,7 +14,9 @@
 <%= render_properties(@properties) %>
 
 <div class="mt10">
-    <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @commits, :entry => @entry }) unless @commits.empty? %>
+
+  <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path ,:revisions => @commits, :entry => @entry ,:commits_pages =>@commits_pages , :commits_count => @commits_count}) unless @commits.empty? %>
+
 </div>
 <% content_for :header_tags do %>
 <%=   stylesheet_link_tag "scm" %>

app/views/repositories/forked.html.erb

@@ -0,0 +1,10 @@
+<div class="project_r_h">
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+</div>
+<%= form_for('forked',:url =>  {:controller => 'repositories', :action => 'forked'},:method => "post") do |f| %>
+    <input type="text" name="repo_name"/>
+    <button type="submit">确定</button>
+<% end %>
+<%= @project.id %>
+<%= @repository.id %>
+<%= User.current %>

app/views/repositories/show.html.erb

@@ -26,21 +26,30 @@
       <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
       <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
       <div class="fr mt5"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_fork"></span>Fork</a> <span href="javascript:void(0);" class="vl_btn_2 fb">0</span> </div>
+      <!--<div class="fr mt5"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_fork"></span><%= link_to "Fork", :controller => 'repositories', :action => 'forked' %></a> <span href="javascript:void(0);" class="vl_btn_2 fb">0</span> </div>-->
       <div class="cl"></div>
       <div class="recordBanner mt10">
         <% if @changesets && !@changesets.empty? %>
+            <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
                 <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
                 <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
+            <% else %>
+                 <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
+                    <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
+                    <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
+                </span>
+            <%end%>
         <% end %>
         <span class="fr mr5 "><font class="fb ml2 mr2 vl_branch mt2">
             <%= @repository.branches.count %></font> 个分支
         </span>
 
         <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
-            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev} %></font> 提交
+            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font> 提交
+
         </span>
       </div>
   <% end %>

app/views/student_work/_has_commit_work.html.erb

@@ -0,0 +1,24 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <div><p align='center' style='margin-top: 35px'>您已提交过作品，请不要重复提交，如果想修改作品请点击编辑。</p></div>
+    <div class="cl"></div>
+    <div class="ni_btn mt10">
+      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
+        编&nbsp;&nbsp;辑
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 15px;margin-top:15px;" >
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    function clickOK() {
+        window.location.href = '<%= edit_student_work_path(@work.id)%>';
+    }
+    function clickCanel() {
+        hideModal('#popbox02');
+        window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+    }
+</script>

app/views/student_work/create.js.erb

@@ -1,4 +1,12 @@
-<% if @submit_result%>
+<% if @has_commit %>
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/has_commit_work') %>');
+    showModal('ajax-modal', '500px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+            "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    $('#ajax-modal').parent().css("top","").css("left","");
+    $('#ajax-modal').parent().addClass("anonymos");
+<% elsif @submit_result%>
     $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
     showModal('ajax-modal', '500px');
     $('#ajax-modal').siblings().remove();

config/configuration.yml

@@ -201,7 +201,7 @@ default:
   judge_server: 'http://judge.trustie.net/'
 
   # Git's url
-  gitlab_address: 'http://git.trustie.net'
+  gitlab_address: 'http://gitfast.trustie.net'
 
 # specific configuration options for production environment
 # that overrides the default ones

config/initializers/gitlab_config.rb

@@ -1,8 +1,8 @@
 Gitlab.configure do |config|
   # config.endpoint       = 'http://192.168.41.130:3000/trustie/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
   # config.private_token  = 'cK15gUDwvt8EEkzwQ_63'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
-  config.endpoint       = 'http://git.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  config.endpoint       = 'http://gitfast.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
-  config.private_token  = 'kZUYYbAY12QSQ2Tx1zes'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  config.private_token  = 'fPc_gBmEiSANve8TCfxW'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
   # Optional
   # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
   # config.sudo         = 'user'                       # username for sudo mode, default: nil

config/locales/projects/zh.yml

@@ -89,6 +89,8 @@ zh:
   project_module_repository: 版本库
   project_module_create_repository: 创建版本库
   project_gitlab_create_repository: 新版本库
+  project_gitlab_create_double_message: 亲，您已经创建了一个同名的版本库，换个特别点的名字同名的概率就会变小哦~
+  project_gitlab_fork_double_message: 亲，您已经有了一个相同名字的版本库，所以不能fork改版本库~
 
 
   label_project_more: 更多

config/routes.rb

@@ -643,6 +643,7 @@ RedmineApp::Application.routes.draw do
         # get 'create', :via=>[:get, :post]
       end
     end
+
     match 'wiki/index',  :via => :get
     resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do
       member do
@@ -740,6 +741,7 @@ RedmineApp::Application.routes.draw do
 
   get 'projects/:id/repository/changes(/*path(.:ext))', :to => 'repositories#changes'
 
+  get 'projects/:id/repository/forked', :to => 'repositories#forked'
   get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
   get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
   get 'projects/:id/repository/revision', :to => 'repositories#revision'

lib/gitlab-cli/lib/gitlab/client/projects.rb

@@ -239,6 +239,12 @@ class Gitlab::Client
       delete("/projects/#{project}/hooks/#{id}")
     end
 
+    # Forks a project into the user namespace of the authenticated user.
+    # @param  [Integer] - The ID of the project to be forked
+    def fork(id)
+      post("/projects/fork/#{id}")
+    end
+
     # Mark this project as forked from the other
     #
     # @example

lib/tasks/sync_sigle_rep.rake

@@ -12,19 +12,15 @@ namespace :sync_rep do
         puts count
         unless count > 1
           rep.identifier
-          puts "################################"
-          puts project.id
-          puts rep.id
           s = Trustie::Gitlab::Sync.new
           s.sync_project(project, path: rep.identifier, import_url: rep.url)
           rep.type = 'Repository::Gitlab'
           rep.save
-          puts "*************************************"
-          puts project.id
-          puts rep.id
-          puts rep.identifier
         end
       end
     end
   end
+
+  task :delete_rep => :environment do
+  end
 end

lib/trustie/gitlab/sync.rb

@@ -73,11 +73,6 @@ module Trustie
 
             # import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git
             # can use password
-            puts "@@@@@@@@@@@@@@@@@@@@@@@"
-            puts path
-            puts project.description
-            puts gid
-            puts import_url
             gproject = self.g.create_project(path, 
                             path: path,
                             description: project.description, 
@@ -91,7 +86,6 @@ module Trustie
                             import_url: import_url,
                             visibility_level: project.is_public? ? UserLevel::PUBLIC : UserLevel::PRIVATE
                             )
-            puts "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
             project.gpid = gproject.id
             project.save!
             puts "Successfully created #{project.name}"

public/stylesheets/repository.css

@@ -220,7 +220,7 @@
 .vl_branch {background:url(../images/vlicon/branch_icon.png) 0px -2px no-repeat; padding-left:22px}
 .mt1 {margin-top:1px;}
 .mt2 {margin-top:2px;}
-.commit_content_dec{width: 300px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;}
+.commit_content_dec{width: 200px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;}
 
 /*提交信息列表*/
 .col-md-10 {