Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
794c0a223454
Unverified
Commit
1c61ac1c
authored
Feb 18, 2014
by
Dmitriy Zaporozhets
Browse files
Refactor MR code reload
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
01e0487f19e8
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/merge_requests_controller.rb
View file @
794c0a22
...
...
@@ -106,9 +106,6 @@ def update
params
[
:merge_request
].
delete
(
:target_project_id
)
if
@merge_request
.
update_attributes
(
params
[
:merge_request
].
merge
(
author_id_of_changes:
current_user
.
id
))
@merge_request
.
reload_code
@merge_request
.
mark_as_unchecked
@merge_request
.
reset_events_cache
respond_to
do
|
format
|
...
...
app/models/merge_request.rb
View file @
794c0a22
...
...
@@ -32,7 +32,9 @@ class MergeRequest < ActiveRecord::Base
belongs_to
:source_project
,
foreign_key: :source_project_id
,
class_name:
"Project"
has_one
:merge_request_diff
,
dependent: :destroy
after_create
:create_merge_request_diff
after_update
:update_merge_request_diff
delegate
:commits
,
:diffs
,
:last_commit
,
:last_commit_short_sha
,
to: :merge_request_diff
,
prefix:
nil
...
...
@@ -125,6 +127,13 @@ def validate_branches
end
end
def
update_merge_request_diff
if
source_branch_changed?
||
target_branch_changed?
reload_code
mark_as_unchecked
end
end
def
reload_code
if
merge_request_diff
&&
opened?
merge_request_diff
.
reload_content
...
...
lib/api/merge_requests.rb
View file @
794c0a22
...
...
@@ -116,8 +116,6 @@ def target_matches_fork(target_project_id,user_project)
authorize!
:modify_merge_request
,
merge_request
if
merge_request
.
update_attributes
attrs
merge_request
.
reload_code
merge_request
.
mark_as_unchecked
present
merge_request
,
with:
Entities
::
MergeRequest
else
handle_merge_request_errors!
merge_request
.
errors
...
...
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