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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7abfe14e
Commit
7abfe14e
authored
Jan 12, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reverting merge_request_controller
parent
fa8b228f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-9
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
7abfe14e
...
@@ -48,15 +48,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -48,15 +48,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@note_counts
=
Note
.
where
(
commit_id:
@merge_request
.
commits
.
map
(
&
:id
)).
@note_counts
=
Note
.
where
(
commit_id:
@merge_request
.
commits
.
map
(
&
:id
)).
group
(
:commit_id
).
count
group
(
:commit_id
).
count
json_merge_request
=
@merge_requests
.
as_json
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
json
do
format
.
json
{
render
json:
@merge_request
}
render
json:
{
hi:
"yes"
}
end
format
.
diff
{
render
text:
@merge_request
.
to_diff
(
current_user
)
}
format
.
diff
{
render
text:
@merge_request
.
to_diff
(
current_user
)
}
format
.
patch
{
render
text:
@merge_request
.
to_patch
(
current_user
)
}
format
.
patch
{
render
text:
@merge_request
.
to_patch
(
current_user
)
}
end
end
...
@@ -149,8 +143,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -149,8 +143,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
format
.
json
do
format
.
json
do
render
json:
{
render
json:
{
saved:
@merge_request
.
valid?
,
saved:
@merge_request
.
valid?
,
assignee_avatar_url:
@merge_request
.
assignee
.
try
(
:avatar_url
),
assignee_avatar_url:
@merge_request
.
assignee
.
try
(
:avatar_url
)
closed_event:
@merge_request
.
closed_event
}
}
end
end
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