diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 0a3c61c90..1a561006a 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -107,7 +107,7 @@ class CoursesController < ApplicationController
       courses = Course.visible
       @courses = paginateHelper courses,10
     else
-      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'")
+      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'").order("time desc, created_at desc")
       @courses = paginateHelper courses,10
     end
    @name = params[:name]
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 8a1b3bbe0..0acf75c62 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -215,11 +215,11 @@ update
       end
     end
 
-    unless @repository.gitlab?
-      # redirect_to to_gitlab_project_repository_path(@project, @repository)
-      render :to_gitlab
-      return
-    end
+    # unless @repository.gitlab?
+    #   # redirect_to to_gitlab_project_repository_path(@project, @repository)
+    #   render :to_gitlab
+    #   return
+    # end
 
     #if( !User.current.member_of?(@project) || @project.hidden_repo)
     @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
@@ -252,11 +252,10 @@ update
       project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
       ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
-      if @repository.type.to_s=="Repository::Gitlab"
+      if @repository.type.to_s == "Repository::Gitlab"
         @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
       else
-        @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+
-            @repository.url.slice(project_path_cut, @repository.url.length).to_s
+        @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s
       end
       if @course_tag == 1
         render :action => 'show', :layout => 'base_courses'
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 84364b4f6..01b126c26 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -609,6 +609,12 @@ module ApplicationHelper
     return @result
   end
 
+  # 判断版本库是否初始为gitlab
+  def rep_is_gitlab?(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab")
+    return rep.blank? ? true :false
+  end
+
   # 判断当前用户是否为项目管理员
   def is_project_manager?(user_id, project_id)
     @result = false
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 41f25d1a3..48766813c 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -117,6 +117,22 @@ module ProjectsHelper
     end
   end
 
+  # 获取新增gitlab版本库
+  def rep_gitlab(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab")
+  end
+
+  # 获取新项目的版本库地址
+  def rep_gitlab_url(project)
+    gitlab_address = Redmine::Configuration['gitlab_address']
+    url = gitlab_address.to_s+"/"+project.owner.to_s+"/"+project.identifier+"."+"git"
+  end
+
+  #  # 获取Forge历史版本库
+  def rep_forge(project)
+    rep = Repository.where("project_id =? and type =?", project, "Repository::Git")
+  end
+
   # Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},
diff --git a/app/views/members/update.js.erb b/app/views/members/update.js.erb
index c5ef983e7..7c27e39fc 100644
--- a/app/views/members/update.js.erb
+++ b/app/views/members/update.js.erb
@@ -2,6 +2,8 @@
 $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
 <%elsif @course%>
 $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+$("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>")
+$("#student_number").html("<%= studentCount(@course) %>");
 <%end%>
 hideOnLoad();
 
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 7e39ad5fa..be178607f 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -17,7 +17,7 @@
         <ul class="setting_left">
           <li>登录名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li>邮箱&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li>身份&nbsp;:&nbsp;</li>
+          <li>身份&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_2="true" style="display:none;">组织名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
@@ -34,7 +34,10 @@
           <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
 
           <li>
-            <select onchange="showtechnical_title(this.value);" name="identity" id="userIdentity" class="location" class="w70" style="height:28px;margin-left:2px;">
+            <select onchange="showtechnical_title(this.value);" required = true, nh_required="1" name="identity" id="userIdentity" class="location" class="w70" style="height:28px;margin-left:2px;">
+              <option value="-1">
+                <%= l(:label_account_identity_choose) %>
+              </option>
               <option value="0">
                 <%= l(:label_account_identity_teacher) %>
               </option>
@@ -61,6 +64,7 @@
                 <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID),:style=>"60px" %></span>
               <% end %>
             </span>
+            <span id="identity_hint" style="display: none"></span>
           </li>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= f.text_field :lastname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
@@ -701,6 +705,11 @@
     $("#users_tb_2").click();
     <% end %>
     $('#my_account_form_link').click(function(e){
+        if($("#userIdentity").val() == -1 ) {
+            $("#identity_hint").html('<span style="color:red">请选择身份</span>').show();
+            e.stopImmediatePropagation();
+            return;
+        }
         if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){  //学校名字和id不对的话
             $("#hint").html('<span style="color:red">学校必须是从下拉列表中选择的,不能手动修改</span>').show();
             e.stopImmediatePropagation();
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 1da51c6e4..b71109da7 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -42,8 +42,15 @@
 <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
 <% if visible_repository?(@project) %>
   <div class="subNav">
-    <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id, to: 'gitlab'},  :class => "f14 c_blue02" %>
+    <% if rep_is_gitlab?(@project) %>
+        <%= link_to l(:project_module_repository), {:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories'},  :class => "f14 c_blue02" %>
+    <% else %>
+        <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id },  :class => "f14 c_blue02" %>
+    <% end %>
     <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_module_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
+    <% end %>
   </div>
 <% end %>
 <!-- more -->
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index bfb87b16a..e614dc5fe 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -7,87 +7,80 @@
 <%= str = error_messages_for 'repository' %>
 <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
 <% ip = RepositoriesHelper::REPO_IP_ADDRESS %><!--Added by tanxianbo For formatting project's path-->
+<%# 新建版本库 %>
+
+<% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %>
+    <div style="padding-bottom: 40px">
+      <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
+      <a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
+        <% course_tag = @project.project_type %>
+        <% if User.current.allowed_to?(:manage_repository, @project) %>
+            <!--newrepo_project_repository_path(@project, :course => course_tag) -->
+            <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %></p>
+        <% end %>
+      </a>
+      <div class="cl"></div>
+
+      <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
+          <div id="pro_st_edit_ku" class="pro_st_edit_ku">
+            <ul>
+              <li style="display: none">
+                <label class="label02"><%=l(:label_scm)%>：</label>
+                <%= select_tag('repository_scm',
+                               options_for_select(["Git"],@repository.class.name.demodulize),
+                               :data => {:remote => true, :method => 'get'}) %>
+                <% if @repository && ! @repository.class.scm_available %>
+                    <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
+                <% end %>
+              </li>
+              <li >
+                <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+                <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
+                <label class="label02"><span class="c_red">*</span><%=l(:label_repository_name)%>：</label>
+                <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
+                <% unless @repository.identifier_frozen? %>
+                    <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
+                <% end %>
+              </li>
+              <div class="cl"></div>
+            </ul>
+            <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml38 "><%=l(:lable_project_rep_create) %></a>
+            <a href="<%= settings_project_path(@project, :tab => 'repositories')%>" class="grey_btn fl ml38 "><%=l(:button_cancel)%></a>
+          </div><!--pro_st_edit_issues end-->
+      <% end %>
+    </div>
+<% end %>
+
+
 <% if @project.repositories.any? %>
+    <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %>
+    <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %>
+    <div class="rep_history_title">历史版本库</div>
     <table class="pro_table">
       <tbody>
-      <tr class="pro_table_tit">
-        <td class=" w150"><%= l(:field_identifier) %></td>
-        <td class="w150"> <%= l(:field_repository_is_default) %></td>
-        <td class="w150"><%= l(:label_scm) %> </td>
-        <td class="w150" ><%= l(:label_repository_path) %> </td>
-        <td class="w150"> </td>
-        <td class="w150"> </td>
-      </tr>
-      <% @project.repositories.sort.each do |repository| %>
-          <tr class="<%= cycle 'pro_table_on', '' %>">
-            <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
-              <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
-            <td> <%= checked_image repository.is_default? %></td>
-            <td><%=h repository.scm_name %></td>
+      <% rep_forge(@project).sort.each do |repository| %>
+          <tr class="<%= cycle 'pro_table_on_forge', '' %>">
+            <td class="w150"><span class="rep_history_grey" title="<%= repository.identifier %>">
+              <%= repository.identifier %></span></td>
+            <td class="w150"><span class="rep_history_grey"><%=h repository.scm_name %></span></td>
             <%if repository.scm_name=="Git"%>
-                <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
-         <%=h repository.url.slice(project_path_cut, repository.url.length) %>"> <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%></td><!--Modified by tanxianbo-->
+                <td class="w362" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
+              <%=h repository.url.slice(project_path_cut, repository.url.length) %>">
+                <span class="rep_history_grey">
+                  <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>60) %>
+                </span>
+                </td><!--Modified by tanxianbo-->
             <%else %>
-                <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
+                <td class="w360" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
             <% end %>
-            <td><a href="javascript:viod(0)" class="c_blue" >
-              <% if repository.scm_name=="Git"%>
-                  <%if User.current.allowed_to?(:manage_repository, @project) %>
-                      <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
-                  <% end %>
-              <% end %>
-            </a></td>
-            <td>
-              <% if repository.login.to_s==User.current.login.to_s %>
-                  <%= delete_new_link repository_path(repository) %>
-              <% end %></td>
           </tr>
       <% end %>
       </tbody>
     </table>
 <% else %>
-    <p class="nodata"><%= l(:label_repository_no_data) %></p>
+    <p class="nodata">温馨提示：<%= l(:label_repository_no_data) %></p>
 <% end %>
 
-<%# 新建版本库 %>
-<% if @project.repositories.count == 0 %>
-    <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
-    <a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
-      <% course_tag = @project.project_type %>
-      <% if User.current.allowed_to?(:manage_repository, @project) %>
-          <!--newrepo_project_repository_path(@project, :course => course_tag) -->
-          <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %></p>
-      <% end %>
-    </a>
-    <div class="cl"></div>
 
-    <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
-        <div id="pro_st_edit_ku" class="pro_st_edit_ku">
-          <ul>
-            <li >
-              <label class="label02"><%=l(:label_scm)%>：</label>
-              <%= select_tag('repository_scm',
-                             options_for_select(["Git"],@repository.class.name.demodulize),
-                             :data => {:remote => true, :method => 'get'})%>
-              <% if @repository && ! @repository.class.scm_available %>
-                  <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
-              <% end %>
-            </li>
-            <li >
-              <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
-              <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-              <label class="label02"><span class="c_red">*</span><%=l(:label_repository_name)%>：</label>
-              <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
-              <% unless @repository.identifier_frozen? %>
-                  <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
-              <% end %>
-            </li>
-            <div class="cl"></div>
-          </ul>
-          <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml110"><%=l(:button_save)%></a>
-          <a href="<%= settings_project_path(@project, :tab => 'repositories')%>" class="grey_btn fl ml10"><%=l(:button_cancel)%></a>
-        </div><!--pro_st_edit_issues end-->
-    <% end %>
 
-<% end %>
 
diff --git a/app/views/projects/settings/_rep_forge.html.erb b/app/views/projects/settings/_rep_forge.html.erb
new file mode 100644
index 000000000..e25849c38
--- /dev/null
+++ b/app/views/projects/settings/_rep_forge.html.erb
@@ -0,0 +1,38 @@
+<table class="pro_table">
+  <tbody>
+  <tr class="pro_table_tit">历史版本</tr>
+  <tr class="pro_table_tit">
+    <td class=" w150"><%= l(:field_identifier) %></td>
+    <td class="w150"> <%= l(:field_repository_is_default) %></td>
+    <td class="w150"><%= l(:label_scm) %> </td>
+    <td class="w150" ><%= l(:label_repository_path) %> </td>
+    <td class="w150"> </td>
+    <td class="w150"> </td>
+  </tr>
+  <% rep_forge(project).sort.each do |repository| %>
+      <tr class="<%= cycle 'pro_table_on', '' %>">
+        <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
+          <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
+        <td> <%= checked_image repository.is_default? %></td>
+        <td><%=h repository.scm_name %></td>
+        <%if repository.scm_name=="Git"%>
+            <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
+         <%=h repository.url.slice(project_path_cut, repository.url.length) %>"> <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%></td><!--Modified by tanxianbo-->
+        <%else %>
+            <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
+        <% end %>
+        <td><a href="javascript:viod(0)" class="c_blue" >
+          <% if repository.scm_name=="Git"%>
+              <%if User.current.allowed_to?(:manage_repository, @project) %>
+                  <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
+              <% end %>
+          <% end %>
+        </a></td>
+        <td>
+          <% if repository.login.to_s==User.current.login.to_s %>
+              <%= delete_new_link repository_path(repository) %>
+          <% end %></td>
+      </tr>
+  <% end %>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/app/views/projects/settings/_rep_gitlab.html.erb b/app/views/projects/settings/_rep_gitlab.html.erb
new file mode 100644
index 000000000..1de706b5d
--- /dev/null
+++ b/app/views/projects/settings/_rep_gitlab.html.erb
@@ -0,0 +1,26 @@
+<% rep_gitlab(project).sort.each do |repository| %>
+
+    <table class="pro_table">
+      <tbody>
+      <tr class="pro_table_tit">
+        <td class=" w150"><%= l(:field_identifier) %></td>
+        <td class="w150"><%= l(:label_scm) %> </td>
+        <td class="w362" ><%= l(:label_repository_path) %> </td>
+      </tr>
+
+      <tr class="<%= cycle 'pro_table_on', '' %>">
+        <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
+          <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a>
+        </td>
+        <td><%=h repository.scm_name %></td>
+        <%if repository.scm_name=="Gitlab"%>
+            <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<%= rep_gitlab_url(project) %>">
+              <%=truncate(rep_gitlab_url(project), :length => 360) %>
+            </td>
+        <%else %>
+            <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
+        <% end %>
+      </tr>
+<% end %>
+</tbody>
+</table>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index e5fabee0c..c9be16521 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -18,13 +18,13 @@
   <div class=" mt10">
     <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
     <div class="calendar_div fl">
-      <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" placeholder="发布日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.publish_time%>"  >
-      <%= calendar_for('homework_publish_time')%>
-    </div>
-    <div class="calendar_div fl ml10">
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
     </div>
+    <div class="calendar_div fl ml10">
+      <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" placeholder="发布日期(可选)" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.publish_time%>"  >
+      <%= calendar_for('homework_publish_time')%>
+    </div>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index f6bb3c8cb..5c6339e59 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -145,6 +145,7 @@
     var id; //资源id
     var sendType;  //发送到课程 1  发送到项目 2
     var lastSendType;  //保存上次发送的发送类型
+    var last_op
     $("#resources_list").mousedown(function(e) {
         //如果是右键的话
         if (3 == e.which) {
@@ -179,6 +180,28 @@
             last_line = line;
         }
     });
+
+    //鼠标经过时，背景颜色设为灰色
+    $("#resources_list").mouseover(function(e){
+        pageX = e.clientX;
+        pageY = e.clientY;
+        var ele = document.elementFromPoint(pageX,pageY);
+        line = $(ele).parent();
+        if(last_op != null){
+            last_op.children().css("background-color", 'white');
+            restore();
+            last_op == null;
+        }
+        //如果当前的tag是li，那么还要li的父级元素
+        if(line.get(0).tagName === 'LI'){
+            line = line.parent();
+        }
+        //将当前的元素的所有子元素的背景色改为蓝色
+        line.children().css("background-color", '#e1e1e1');
+        //将当前元素赋给 上一个对象 保存起来。
+        last_op = line;
+    });
+
     //元素包含关系计算
     var contains  = function(root, el) {
         if (root.compareDocumentPosition)
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 61bad2a00..3b5e9790e 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -200,7 +200,7 @@ zh:
   label_subject_empty: 主题不能为空
 
   label_no_data: 没有任何数据可供显示
-  label_repository_no_data: 您还没有创建版本库，每个项目只允许创建一个版本库！
+  label_repository_no_data: 每个项目只能创建一个版本库！
   # 项目、课程、用户公用
   label_settings: 配置
   label_information_plural: 信息  
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index cce03b13e..88a710633 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -88,6 +88,8 @@ zh:
   project_module_files: 资源库 
   project_module_repository: 版本库
   project_module_create_repository: 创建版本库
+  project_gitlab_create_repository: 新版本库
+
 
   label_project_more: 更多
   project_module_news: 新闻
@@ -112,6 +114,7 @@ zh:
   label_project_overview: "项目简介"
   label_expend_information: 展开更多信息
   label_project_create: "新建了项目"
+  lable_project_rep_create: 创建
  
   #   
   #  项目托管平台
diff --git a/db/migrate/20151102083844_drop_organization.rb b/db/migrate/20151102083844_drop_organization.rb
new file mode 100644
index 000000000..1abb0f6d9
--- /dev/null
+++ b/db/migrate/20151102083844_drop_organization.rb
@@ -0,0 +1,8 @@
+class DropOrganization < ActiveRecord::Migration
+  def up
+    drop_table :organizations
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151102084419_create_organization.rb b/db/migrate/20151102084419_create_organization.rb
new file mode 100644
index 000000000..af84ebee9
--- /dev/null
+++ b/db/migrate/20151102084419_create_organization.rb
@@ -0,0 +1,18 @@
+class CreateOrganization < ActiveRecord::Migration
+  def up
+    create_table :organizations do |t|
+      t.string :name
+      t.text :description
+      t.integer :creator_id
+      t.integer :home_id
+      t.string :domain
+      t.boolean :is_public
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :organizations
+  end
+end
diff --git a/db/migrate/20151102090519_create_org_members.rb b/db/migrate/20151102090519_create_org_members.rb
new file mode 100644
index 000000000..037d8a3c6
--- /dev/null
+++ b/db/migrate/20151102090519_create_org_members.rb
@@ -0,0 +1,14 @@
+class CreateOrgMembers < ActiveRecord::Migration
+  def up
+    create_table :org_members do |t|
+      t.integer :user_id
+      t.integer :organization_id
+      t.string :role
+
+    end
+  end
+
+  def down
+    drop_table :org_members
+  end
+end
diff --git a/lib/tasks/update_rep_if_fault.rake b/lib/tasks/update_rep_if_fault.rake
new file mode 100644
index 000000000..7bcf63c4c
--- /dev/null
+++ b/lib/tasks/update_rep_if_fault.rake
@@ -0,0 +1,22 @@
+#coding=utf-8
+
+namespace :rep_fault do
+  desc "update fault rep"
+  task :rep_update => :environment do
+    Project.all.each do |project|
+      if project.repositories.count > 0
+        unless Repository.where("project_id =? and type = ?",project, "Repository::Gitlab").blank?
+          project.repositories.each do |repository|
+            repository.update_attributes(:is_default => false)
+          end
+        end
+      end
+    end
+  end
+
+  desc "update ossean's data"
+  task :update_type => :environment do
+    repository = Repository.find(400)
+    repository.update_attributes(:type => "Repository::Git")
+  end
+end
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index e0bf981a1..4594d0c51 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -553,6 +553,7 @@ a:hover.member_btn{ background:#329cbd;}
 .pro_table tr td{ height:30px;}
 .pro_table_tit{  text-align:center; font-weight:bold;}
 .pro_table_on{  background:#f0fbff; }
+.pro_table_on_forge{  background: #EAEAEA; }
 .pro_st_edit_issues{ display:none; margin-top:20px;}
 .pro_st_edit_issues ul li{ margin-bottom:10px;}
 .pro_st_edit_ban{ display:none; margin-top:20px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 0be7a6ff0..0c4479907 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -71,6 +71,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
 .ml30{ margin-left:30px;}
+.ml38{ margin-left:38px;}
 .ml60{ margin-left:60px;}
 .ml80{ margin-left:80px;}
 .ml90{ margin-left:90px;}
@@ -133,6 +134,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w265{ width: 265px;}
 .w270{ width: 270px;}
 .w350 {width:350px;}
+.w362 {width:362px;}
 .w430{ width:470px;}
 .w520{ width:520px;}
 .w543{ width:543px;}
diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css
index 71cbd47b6..e2d636e2e 100644
--- a/public/stylesheets/repository.css
+++ b/public/stylesheets/repository.css
@@ -275,4 +275,13 @@ li.commit .commit-row-info a {
 }
 li.commit .commit-row-info .committed_ago {
     display: inline-block;
+}
+.rep_history_title{
+    font-weight: bold;
+    font-size: 13px;
+    color: #7F7F7F;
+    padding-bottom: 10px;
+}
+.rep_history_grey{
+    color: #7F7F7F;
 }
\ No newline at end of file