summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-21 12:22:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-21 12:22:18 +0300
commit606701ada4076b963439983a5633535108d81f0f (patch)
tree69a61cd46ae34fa5f943fbc7a9c18b9a7c72d0ad
parent625fb2f29d99ab21de2497a36512be69c80e39be (diff)
downloadgitlab-ce-606701ada4076b963439983a5633535108d81f0f.tar.gz
Look for milestone by iid in milestone controller
-rw-r--r--app/controllers/projects/milestones_controller.rb2
-rw-r--r--spec/models/milestone_spec.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index f4ee7427d29..39cd579cce5 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -81,7 +81,7 @@ class Projects::MilestonesController < Projects::ApplicationController
protected
def milestone
- @milestone ||= @project.milestones.find(params[:id])
+ @milestone ||= @project.milestones.find_by_iid!(params[:id])
end
def authorize_admin_milestone!
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index dfda1c87379..23b8a4aeae5 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -25,6 +25,7 @@ describe Milestone do
end
describe "Validation" do
+ before { subject.stub(set_iid: false) }
it { should validate_presence_of(:title) }
it { should validate_presence_of(:project) }
end