Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
e5925d07
Commit
e5925d07
authored
Oct 15, 2015
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed Note.inc_associations to with_associations
parent
9f581111
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-1
app/models/note.rb
app/models/note.rb
+1
-1
No files found.
app/controllers/projects/issues_controller.rb
View file @
e5925d07
...
@@ -57,7 +57,7 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -57,7 +57,7 @@ class Projects::IssuesController < Projects::ApplicationController
def
show
def
show
@participants
=
@issue
.
participants
(
current_user
)
@participants
=
@issue
.
participants
(
current_user
)
@note
=
@project
.
notes
.
new
(
noteable:
@issue
)
@note
=
@project
.
notes
.
new
(
noteable:
@issue
)
@notes
=
@issue
.
notes
.
inc
_associations
.
fresh
@notes
=
@issue
.
notes
.
with
_associations
.
fresh
@noteable
=
@issue
@noteable
=
@issue
respond_with
(
@issue
)
respond_with
(
@issue
)
...
...
app/models/note.rb
View file @
e5925d07
...
@@ -60,7 +60,7 @@ class Note < ActiveRecord::Base
...
@@ -60,7 +60,7 @@ class Note < ActiveRecord::Base
scope
:inc_author_project
,
->
{
includes
(
:project
,
:author
)
}
scope
:inc_author_project
,
->
{
includes
(
:project
,
:author
)
}
scope
:inc_author
,
->
{
includes
(
:author
)
}
scope
:inc_author
,
->
{
includes
(
:author
)
}
scope
:
inc
_associations
,
->
do
scope
:
with
_associations
,
->
do
includes
(
:author
,
:noteable
,
:updated_by
,
includes
(
:author
,
:noteable
,
:updated_by
,
project:
[
:project_members
,
{
group:
[
:group_members
]}])
project:
[
:project_members
,
{
group:
[
:group_members
]}])
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment