summaryrefslogtreecommitdiff
path: root/app/controllers/milestones_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-14 21:39:55 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-14 21:39:55 +0200
commitf2db188dbe26b93e76eb3536f1a972a4a9e01f66 (patch)
treede924b6769965cbd7fb096ac74ed6f0f6d97daed /app/controllers/milestones_controller.rb
parent678e5355a3e43aa2a13d109fe5d75de231eef413 (diff)
downloadgitlab-ce-f2db188dbe26b93e76eb3536f1a972a4a9e01f66.tar.gz
Processing with note events. reformated dashboard for more events to handle
Diffstat (limited to 'app/controllers/milestones_controller.rb')
-rw-r--r--app/controllers/milestones_controller.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/milestones_controller.rb b/app/controllers/milestones_controller.rb
index fb3bdf4a3dd..a0c824e8abb 100644
--- a/app/controllers/milestones_controller.rb
+++ b/app/controllers/milestones_controller.rb
@@ -43,7 +43,7 @@ class MilestonesController < ProjectResourceController
def create
@milestone = @project.milestones.new(params[:milestone])
- @milestone.author_id = current_user.id
+ @milestone.author_id_of_changes = current_user.id
if @milestone.save
redirect_to project_milestone_path(@project, @milestone)
@@ -53,8 +53,7 @@ class MilestonesController < ProjectResourceController
end
def update
- @milestone.author_id = current_user.id
- @milestone.update_attributes(params[:milestone])
+ @milestone.update_attributes(params[:milestone].merge(author_id_of_changes: current_user.id))
respond_to do |format|
format.js