summaryrefslogtreecommitdiff
path: root/app/helpers/merge_requests_helper.rb
diff options
context:
space:
mode:
authorIzaak Alpert <ialpert@blackberry.com>2013-07-16 17:14:03 -0400
committerIzaak Alpert <ialpert@blackberry.com>2013-07-17 22:48:03 -0400
commitd99594273d57b2d5ed7c748b3185712960b89478 (patch)
tree5f5d6da6011465e3521c7c3ab09ec7a38dbef37a /app/helpers/merge_requests_helper.rb
parent128f2845770b7a6d553ee764cdbbe63da5ba9e84 (diff)
downloadgitlab-ce-d99594273d57b2d5ed7c748b3185712960b89478.tar.gz
Style changes from review with @randx
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
-rw-r--r--app/helpers/merge_requests_helper.rb19
1 files changed, 9 insertions, 10 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index e8e7bf990ac..0fb4709e9c3 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -1,26 +1,25 @@
module MergeRequestsHelper
def new_mr_path_from_push_event(event)
new_project_merge_request_path(
- event.project,
- new_mr_from_push_event(event, event.project)
+ event.project,
+ new_mr_from_push_event(event, event.project)
)
end
def new_mr_path_for_fork_from_push_event(event)
new_project_merge_request_path(
- event.project,
- new_mr_from_push_event(event, event.project.forked_from_project)
+ event.project,
+ new_mr_from_push_event(event, event.project.forked_from_project)
)
end
-
def new_mr_from_push_event(event, target_project)
return :merge_request => {
- source_project_id: event.project.id,
- target_project_id: target_project.id,
- source_branch: event.branch_name,
- target_branch: target_project.repository.root_ref,
- title: event.branch_name.titleize
+ source_project_id: event.project.id,
+ target_project_id: target_project.id,
+ source_branch: event.branch_name,
+ target_branch: target_project.repository.root_ref,
+ title: event.branch_name.titleize
}
end