Commit 87c9c5cc authored by Dan Gordon's avatar Dan Gordon

Merge branch '3512-add-details-parameter-to-comparisons' into 'master'

Resolve "Add details parameter to comparisons"

Closes #3512

See merge request !18149
parents f203dfc5 86c9589d
Pipeline #45474940 passed with stages
in 12 minutes and 47 seconds
......@@ -714,7 +714,9 @@ features:
gitlab_premium: true
gitlab_ultimate: true
github: false
bitbucket: true
bitbucket:
valid: 'partially'
details: 'Heres a test'
gogs: false
gitlab_pages: true
gitlab_merge_requests: true
......@@ -5060,12 +5062,16 @@ features:
gitlab_core: false
gitlab_starter: false
gitlab_premium: false
gitlab_ultimate: true
gitlab_ultimate:
valid: true
details: 'supports 11 languages'
pricing_page: true
gitlab_com: true
gitlab_ci: true
blackduck: false
synopsys: true
synopsys:
valid: true
details: 'supports 25 languages'
snyk: false
ca_veracode: true
checkmarx: true
......
- feature_support = locals.fetch(:support, false)
- if (feature_support == "partially")
= partial "includes/icons/comparison/maybe-icon.svg"
- if (feature_support == true)
= partial "includes/icons/comparison/yes-icon.svg"
- if (feature_support == false)
= partial "includes/icons/comparison/no-icon.svg"
- feature_support = locals.fetch(:feature_support, false)
- if (feature_support.is_a?(Hash) == true)
- feature_support.each do |support|
= partial "includes/features/marks", locals: { support: support[1] }
- if (support.first == "details")
%h6{:style => "position: absolute; width: 115px"}= support[1]
- else
= partial "includes/features/marks", locals: { support: feature_support }
......@@ -62,21 +62,12 @@ extra_js:
%p
= link_to feature.link_description, feature.link
%td.check-container.text-center
- feature_support = feature.public_send(key_one)
- if (feature_support == "partially")
= partial "includes/icons/comparison/maybe-icon.svg"
- if (feature_support == true)
= partial "includes/icons/comparison/yes-icon.svg"
- if (feature_support == false)
= partial "includes/icons/comparison/no-icon.svg"
- if feature
= partial "includes/features/feature-item-support", locals: { feature_support: feature.public_send(key_one) }
%td.check-container.text-center
- feature_support = feature.public_send(key_two)
- if (feature_support == "partially")
= partial "includes/icons/comparison/maybe-icon.svg"
- if (feature_support == true)
= partial "includes/icons/comparison/yes-icon.svg"
- if (feature_support == false)
= partial "includes/icons/comparison/no-icon.svg"
- if feature
= partial "includes/features/feature-item-support", locals: { feature_support: feature.public_send(key_two) }
.last-updated-section.text-center
%p.clearfix
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment