OSDN Git Service
(root)
/
wvm
/
gitlab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e5481b
)
Find issues and Mr by iid in controller
author
Dmitriy Zaporozhets
<dmitriy.zaporozhets@gmail.com>
Mon, 19 Aug 2013 19:12:04 +0000
(22:12 +0300)
committer
Dmitriy Zaporozhets
<dmitriy.zaporozhets@gmail.com>
Mon, 19 Aug 2013 19:12:04 +0000
(22:12 +0300)
app/controllers/projects/issues_controller.rb
patch
|
blob
|
history
app/controllers/projects/merge_requests_controller.rb
patch
|
blob
|
history
app/controllers/projects_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/projects/issues_controller.rb
b/app/controllers/projects/issues_controller.rb
index
a7f515a
..
4b6e22e
100644
(file)
--- a/
app/controllers/projects/issues_controller.rb
+++ b/
app/controllers/projects/issues_controller.rb
@@
-91,7
+91,7
@@
class Projects::IssuesController < Projects::ApplicationController
protected
def issue
- @issue ||= @project.issues.find(params[:id])
+ @issue ||= @project.issues.find
_by_iid!
(params[:id])
end
def authorize_modify_issue!
diff --git
a/app/controllers/projects/merge_requests_controller.rb
b/app/controllers/projects/merge_requests_controller.rb
index
d135cf0
..
235247f
100644
(file)
--- a/
app/controllers/projects/merge_requests_controller.rb
+++ b/
app/controllers/projects/merge_requests_controller.rb
@@
-132,7
+132,7
@@
class Projects::MergeRequestsController < Projects::ApplicationController
end
def merge_request
- @merge_request ||= @project.merge_requests.find(params[:id])
+ @merge_request ||= @project.merge_requests.find
_by_iid!
(params[:id])
end
def authorize_modify_merge_request!
diff --git
a/app/controllers/projects_controller.rb
b/app/controllers/projects_controller.rb
index
9e88d0b
..
9b4fe5a
100644
(file)
--- a/
app/controllers/projects_controller.rb
+++ b/
app/controllers/projects_controller.rb
@@
-104,7
+104,7
@@
class ProjectsController < Projects::ApplicationController
def autocomplete_sources
@suggestions = {
emojis: Emoji.names,
- issues: @project.issues.select([:id, :title, :description]),
+ issues: @project.issues.select([:i
i
d, :title, :description]),
members: @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
}