diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 94e2c180c..48d2724a2 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -37,7 +37,7 @@ class PullRequestsController < ApplicationController end def show - @request = @g.merge_request(@rpoject.gpid, id) + #@request = @g.merge_request(@rpoject.gpid, id) end # Accept a merge request. diff --git a/app/views/pull_requests/_pull_request_container.html.erb b/app/views/pull_requests/_pull_request_container.html.erb index e69de29bb..451be228f 100644 --- a/app/views/pull_requests/_pull_request_container.html.erb +++ b/app/views/pull_requests/_pull_request_container.html.erb @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/app/views/pull_requests/new.html.erb b/app/views/pull_requests/new.html.erb index 7c09d3159..3d3f9af61 100644 --- a/app/views/pull_requests/new.html.erb +++ b/app/views/pull_requests/new.html.erb @@ -1,3 +1,4 @@ +<%= render :partial => "pull_requests/pull_request_container" %>
Pull Request
99 | +99 | +<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %> | +
100 | +100 | +<div class="mt10"> | +
111 | ++ | - <div class="fl mr5 fontGrey3"> | +
+ | 111 | ++ <div class="fl mr20 fontGrey3 w80"> | +