项目左侧添加pull request入口

This commit is contained in:
huang 2016-08-01 15:52:05 +08:00
parent 96b04f39b1
commit 7c4759f3b7
2 changed files with 4 additions and 3 deletions

View File

@ -1,5 +1,5 @@
class PullRquestsController < ApplicationController
before_filter :find_project
before_filter :find_project_and_repository
layout "base_projects"
def index
@ -12,6 +12,7 @@ class PullRquestsController < ApplicationController
def find_project
@project = Project.find(params[:project_id])
@repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab")
rescue ActiveRecord::RecordNotFound
render_404
end

View File

@ -59,9 +59,9 @@
<!-- more -->
<% if User.current.member_of?(@project) %>
<div class="subNav">
<%= link_to "Pull Requests", project_files_path(@project), :class => "f14 c_blue02" %>
<%= link_to "Pull Requests", project_pull_rquest_path(@project), :class => "f14 c_blue02" %>
<% unless @project.project_score.attach_num == 0 %>
<%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
<%#= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
<% end %>
</div>
<% end %>