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

Events improved. Open/close issue, merge request events displayed

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-07 00:13:43 -08:00
parent 98b484b996
commit 94befdd502
13 changed files with 98 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/merge_requests_controller.rb
View file

@ -87,7 +87,7 @@ class MergeRequestsController < ApplicationController
def update
respond_to do |format|
if @merge_request.update_attributes(params[:merge_request])
if @merge_request.update_attributes(params[:merge_request].merge(:author_id_of_changes => current_user.id))
format.html { redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.' }
format.json { head :ok }
else