diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index df40eb378..79d82b36a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -357,10 +357,8 @@ class ProjectsController < ApplicationController def settings # 修改查看消息状态 applied_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =? and viewed =?", User.current.id, @project, "AppliedProject", 0) - applied_messages.each do |applied_message| - applied_message.update_attributes(:viewed => true) - end - # end + applied_messages.update_all(:viewed => true) + @issue_custom_fields = IssueCustomField.sorted.all @issue_category ||= IssueCategory.new @member ||= @project.members.new @@ -397,6 +395,7 @@ class ProjectsController < ApplicationController @repository = Repository.factory(scm) @repository.is_default = @project.repository.nil? @repository.project = @project + @gitlab_rep = Repository.where(:type => "Repository::Gitlab", :project_id => @project).first unless @project.gpid.nil? g = Gitlab.client @gitlab_branches = g.branches(@project.gpid) diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index be6330d9b..a346f21b1 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -10,18 +10,10 @@ <%= str = error_messages_for 'repository' %> <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> -<%# 提示 %> -<% if @project.repositories.count>1 %> -
- 项目管理员您好!近日平台完成了版本库升级,以后每个项目将唯一的对应一个版本库。请您按照以下步骤完成项目版本库的更新: -

1. 点击下面的"创建版本库按钮",为本项目创建一个新的版本库;

-

2. 从本项目的历史版本库中选择一个您将使用的版本库,将其完整的克隆(clone)到本地(需要提供您之前设置的版本库口令),然后推送(push)到新建的版本库(注意不能仅推送代码,否则之前各开发者的提交记录将丢失)。

-

3. 本项目的历史版本库将在您新建版本库的一周内自动隐藏,如果您以后需要这些版本库,请与网站联系,我们将为您提供这些版本库的所有数据。

-
-<% end %> + <%# 新建版本库 %> -<% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> -
+<% if @gitlab_rep.nil? %> +
<% course_tag = @project.project_type %> @@ -60,36 +52,8 @@
<% end %>
-<% end %> - - -<% if @project.repositories.any? %> +<% else %> <%= 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" } %> -
历史版本库
- - - <% rep_forge(@project).sort.each do |repository| %> - - - - <%if repository.scm_name=="Git"%> - <% rep_url = "http://" + repository.login.to_s + '_'+ repository.identifier.to_s + "@" + ip.to_s + h( repository.url.slice(project_path_cut, repository.url.length)) %> - - <%else %> - - <% end %> - - <% end %> - -
- <%= repository.identifier %><%=h repository.scm_name %> - - - - <%#= rep_url %> - - <%=h truncate(repository.url,:length=>10) %>
<% end %>