summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-08-10 18:07:50 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-08-10 18:25:15 -0400
commit775418918782d5284000ed0bfea364458c748567 (patch)
treec31e3633a3bcbed17b000f0165cf35edad41f7ca /app/models/merge_request.rb
parent1413c23c502d5a5cbc9b81f553a245103c1d6e50 (diff)
downloadgitlab-ce-775418918782d5284000ed0bfea364458c748567.tar.gz
Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index a77081c9528..47966d669f6 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -20,7 +20,7 @@ class MergeRequest < ActiveRecord::Base
validate :validate_branches
def self.find_all_by_branch(branch_name)
- where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
+ where("source_branch like :branch or target_branch like :branch", branch: branch_name)
end
def human_state
@@ -48,7 +48,7 @@ class MergeRequest < ActiveRecord::Base
end
def mark_as_unchecked
- self.update_attributes(:state => UNCHECKED)
+ self.update_attributes(state: UNCHECKED)
end
def can_be_merged?
@@ -101,11 +101,11 @@ class MergeRequest < ActiveRecord::Base
end
def merge_event
- self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last
+ self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Merged).last
end
def closed_event
- self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Closed).last
+ self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Closed).last
end
def commits
@@ -128,7 +128,7 @@ class MergeRequest < ActiveRecord::Base
end
def mark_as_unmergable
- self.update_attributes :state => CANNOT_BE_MERGED
+ self.update_attributes state: CANNOT_BE_MERGED
end
def reloaded_commits
@@ -150,11 +150,11 @@ class MergeRequest < ActiveRecord::Base
def merge!(user_id)
self.mark_as_merged!
Event.create(
- :project => self.project,
- :action => Event::Merged,
- :target_id => self.id,
- :target_type => "MergeRequest",
- :author_id => user_id
+ project: self.project,
+ action: Event::Merged,
+ target_id: self.id,
+ target_type: "MergeRequest",
+ author_id: user_id
)
end