summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-02 19:30:09 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-02 19:30:09 -0800
commit4f1d1fc51baf396d49f6b159c84e15194706847c (patch)
tree3b4ff8c22e5eaa4276813d661b37192d3f538994 /app/models/merge_request.rb
parent7dad2663a671be5cc70db63333dfe033984452d0 (diff)
downloadgitlab-ce-4f1d1fc51baf396d49f6b159c84e15194706847c.tar.gz
Convert hashes to ruby 1.9 style
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 715257f905f..ad2e8d7879b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -76,7 +76,7 @@ class MergeRequest < ActiveRecord::Base
merge_request.save
end
- after_transition :locked => (any - :locked) do |merge_request, transition|
+ after_transition locked: (any - :locked) do |merge_request, transition|
merge_request.locked_at = nil
merge_request.save
end