jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pull_request ---> new

This commit is contained in:
huang 2016-08-02 16:34:20 +08:00
parent 20bdd23665
commit 3ce1ac80b4
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/pull_requests_controller.rb
View File

@ -9,8 +9,7 @@ class PullRequestsController < ApplicationController
end
def new
# id = params[:]
@request = @g.merge_request(@rpoject.gpid, id)
end
# Creates a merge request.
@ -38,7 +37,7 @@ class PullRequestsController < ApplicationController
end
def show
@request = @g.merge_request(@rpoject.gpid, id)
end
# Accept a merge request.

23
app/views/pull_requests/_form.html.erb Normal file
View File

@ -0,0 +1,23 @@
<% format_tag() do || %>
<% end %>
<div class="new-merge-wrap">
<div class="merge-option-name fl mt8">标题</div><input type="text" class="merge-title-input fl ml30" />
<p class="fl ml100 fontGrey2 mt5">标题以<span class="c_red">[WIP]</span>或<span class="c_red">WIP</span>开头：以防还在进程中的合并请求在它完成之前被合并</p>
<div class="cl mb10"></div>
<div class="merge-option-name fl">描述</div><textarea type="text" class="merge-description-input fl ml30"></textarea>
<p class="fl ml100 f12 mt5"><a href="javascript:void(0);" class="AnnexBtn fl mr10">上传附件</a></p>
<div class="cl"></div>
</div>
<div class="new-merge-wrap borderBottomNone">
<div class="merge-option-name fl">源分支</div><select id="source_branch" class="ml30 fontGrey3 fb fl"><option>master</option><option>develop</option><option>rep_quality</option></select>
<div class="cl mb10"></div>
<div class="merge-option-name fl">目标分支</div><select id="target_branch" class="ml30 fontGrey3 fb fl"><option>master</option><option>develop</option><option>dev_huang</option></select>
<div class="cl"></div>
<p class="fl ml100 mt10"><a href="javascript:void(0);" class="fr linkGrey2">修改分支</a></p>
<div class="cl"></div>
</div>
<div class="new-merge-row b_grey" style="border-top:1px solid #ddd;">
<a href="javascript:void(0);" class="BlueCirBtn fl ml10">提交请求</a>
<a href="javascript:void(0);" class="fr linkGrey2 mt5 mr10">取消</a>
<div class="cl"></div>
</div>

22
app/views/pull_requests/new.html.erb
View File

@ -5,27 +5,7 @@
<div class="cl"></div>
</div>
</div>
<div class="new-merge-wrap">
<div class="merge-option-name fl mt8">标题</div><input type="text" class="merge-title-input fl ml30" />
<p class="fl ml100 fontGrey2 mt5">标题以<span class="c_red">[WIP]</span>或<span class="c_red">WIP</span>开头：以防还在进程中的合并请求在它完成之前被合并</p>
<div class="cl mb10"></div>
<div class="merge-option-name fl">描述</div><textarea type="text" class="merge-description-input fl ml30"></textarea>
<p class="fl ml100 f12 mt5"><a href="javascript:void(0);" class="AnnexBtn fl mr10">上传附件</a></p>
<div class="cl"></div>
</div>
<div class="new-merge-wrap borderBottomNone">
<div class="merge-option-name fl">源分支</div><span class="ml30 fontGrey3 fb fl">dev_huang</span>
<div class="cl mb10"></div>
<div class="merge-option-name fl">目标分支</div><span class="ml30 fontGrey3 fb fl">master</span>
<div class="cl"></div>
<p class="fl ml100 mt10"><a href="javascript:void(0);" class="fr linkGrey2">修改分支</a></p>
<div class="cl"></div>
</div>
<div class="new-merge-row b_grey" style="border-top:1px solid #ddd;">
<a href="javascript:void(0);" class="BlueCirBtn fl ml10">提交请求</a>
<a href="javascript:void(0);" class="fr linkGrey2 mt5 mr10">取消</a>
<div class="cl"></div>
</div>
<ul class="merge-record">
<li><a href="javascript:void(0);" class="active">提交<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">改动<span class="project-number-dot">1</span></a></li>