summaryrefslogtreecommitdiff
path: root/app/services/milestones
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-10 19:22:39 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-10 19:22:39 +0300
commitd65bf4605e561b58d3bb8ddba0ffb335e3a4c768 (patch)
tree7b627163b19c54b38f617ab84462c9f6b7d37502 /app/services/milestones
parentc4b02642d2ca74f463e64dd591796aabe5c54af9 (diff)
downloadgitlab-ce-d65bf4605e561b58d3bb8ddba0ffb335e3a4c768.tar.gz
Fix milestone reopen
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/services/milestones')
-rw-r--r--app/services/milestones/reopen_service.rb2
-rw-r--r--app/services/milestones/update_service.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/milestones/reopen_service.rb b/app/services/milestones/reopen_service.rb
index ff1ba23bdb2..573f9ee5c21 100644
--- a/app/services/milestones/reopen_service.rb
+++ b/app/services/milestones/reopen_service.rb
@@ -1,7 +1,7 @@
module Milestones
class ReopenService < Milestones::BaseService
def execute(milestone)
- if milestone.reopen
+ if milestone.activate
event_service.reopen_milestone(milestone, current_user)
end
diff --git a/app/services/milestones/update_service.rb b/app/services/milestones/update_service.rb
index 69254a79670..307e96a2b36 100644
--- a/app/services/milestones/update_service.rb
+++ b/app/services/milestones/update_service.rb
@@ -1,10 +1,10 @@
module Milestones
class UpdateService < Milestones::BaseService
def execute(milestone)
- state = params.delete('state_event')
+ state = params.delete('state_event') || params.delete(:state_event)
case state
- when 'reopen'
+ when 'activate'
Milestones::ReopenService.new(project, current_user, {}).execute(milestone)
when 'close'
Milestones::CloseService.new(project, current_user, {}).execute(milestone)