pull request页面删除

This commit is contained in:
Tim 2016-08-01 16:57:55 +08:00
parent e33bbfff3f
commit 1fc617d5fa
9 changed files with 10 additions and 55 deletions

View File

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

View File

@ -1,3 +0,0 @@
// Place all the styles related to the pull_rquests controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@ -1,31 +0,0 @@
class PullRquestsController < ApplicationController
before_filter :find_project_and_repository
before_filter :connect_gitlab, :only => [:index, :show]
layout "base_projects"
def index
results = @g.merge_requests(@project.gpid)
end
def new
end
def create
end
private
def connect_gitlab
@g = Gitlab.client
end
def find_project_and_repository
@project = Project.find(params[:project_id])
render_404 if @project.gpid.blank?
@repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab")
rescue ActiveRecord::RecordNotFound
render_404
end
end

View File

@ -1,2 +0,0 @@
module PullRquestsHelper
end

View File

@ -0,0 +1,10 @@
<ul id="test" class="project-merge-banner">
<li><a href="javascript:void(0);">打开<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">合并<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">关闭<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">全部<span class="project-number-dot">3</span></a></li>
</ul>
<script>
$("#test").parent().css("width","730px");
</script>

View File

@ -1,10 +0,0 @@
<ul id="test" class="project-merge-banner">
<li><a href="javascript:void(0);">打开<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">合并<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">关闭<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">全部<span class="project-number-dot">3</span></a></li>
</ul>
<script>
$("#test").parent().css("width","730px");
</script>

View File

@ -1 +0,0 @@
<%= project_pull_rquest_path %>

View File

@ -1,5 +0,0 @@
require 'rails_helper'
RSpec.describe PullRquestsController, :type => :controller do
end