deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr

Browse source 
Conflicts:
	app/views/merge_requests/_form.html.haml
This commit is contained in:
randx 2012-10-29 21:37:46 +02:00
commit ecdf778e80
14 changed files with 124 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/milestones_controller.rb
View file

@ -32,6 +32,7 @@ class MilestonesController < ProjectResourceController
def show
@issues = @milestone.issues
@users = @milestone.participants
@merge_requests = @milestone.merge_requests
respond_to do |format|
format.html