Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicael.bergeron <micaelbergeron@gmail.com>2017-12-01 22:08:30 +0300
committermicael.bergeron <micaelbergeron@gmail.com>2017-12-07 17:06:59 +0300
commit360b94ceba146935a40b02f39ed3d833eaea134a (patch)
tree37a6c9b9e3424dfc0cb5446ddb17be97bb34f379 /app/helpers
parent17075a0bdc0c271e9f7a4f25829c0517656d5871 (diff)
adding view and feature specs
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/merge_requests_helper.rb32
1 files changed, 16 insertions, 16 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 004aaeb2c56..ce57422f45d 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -101,28 +101,28 @@ module MergeRequestsHelper
}.merge(merge_params_ee(merge_request))
end
- def tab_link_for(tab, options={}, &block)
+ def tab_link_for(merge_request, tab, options = {}, &block)
data_attrs = {
action: tab.to_s,
- target: "##{tab.to_s}",
+ target: "##{tab}",
toggle: options.fetch(:force_link, false) ? '' : 'tab'
}
url = case tab
- when :show
- data_attrs.merge!(target: '#notes')
- project_merge_request_path(@project, @merge_request)
- when :commits
- commits_project_merge_request_path(@project, @merge_request)
- when :pipelines
- pipelines_project_merge_request_path(@project, @merge_request)
- when :diffs
- diffs_project_merge_request_path(@project, @merge_request)
- else
- raise "Cannot create tab #{tab}."
- end
-
- link_to(url, data: data_attrs, &block)
+ when :show
+ data_attrs[:target] = '#notes'
+ method(:project_merge_request_path)
+ when :commits
+ method(:commits_project_merge_request_path)
+ when :pipelines
+ method(:pipelines_project_merge_request_path)
+ when :diffs
+ method(:diffs_project_merge_request_path)
+ else
+ raise "Cannot create tab #{tab}."
+ end
+
+ link_to(url[merge_request.project, merge_request], data: data_attrs, &block)
end
def merge_params_ee(merge_request)