diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 5f70e5771..94e2c180c 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -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. diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb new file mode 100644 index 000000000..73613a97b --- /dev/null +++ b/app/views/pull_requests/_form.html.erb @@ -0,0 +1,23 @@ +<% format_tag() do || %> +<% end %> +
+
标题
+

标题以[WIP]WIP开头:以防还在进程中的合并请求在它完成之前被合并

+
+
描述
+

上传附件

+
+
+
+
源分支
+
+
目标分支
+
+

修改分支

+
+
+
+ 提交请求 + 取消 +
+
\ 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 e206f2775..7c2928436 100644 --- a/app/views/pull_requests/new.html.erb +++ b/app/views/pull_requests/new.html.erb @@ -5,27 +5,7 @@
-
-
标题
-

标题以[WIP]WIP开头:以防还在进程中的合并请求在它完成之前被合并

-
-
描述
-

上传附件

-
-
-
-
源分支
dev_huang -
-
目标分支
master -
-

修改分支

-
-
-
- 提交请求 - 取消 -
-
+