Commit 87d4721a authored by Trevor Knudsen's avatar Trevor Knudsen

resolve conflicts

parent 02dc8611
......@@ -97,10 +97,9 @@ check_links:
- gitlab-org
generate-handbook-changelog:
before_script: []
stage: build
script:
- bin/generate_handbook_changelog
- bundle exec bin/generate_handbook_changelog
only:
- schedules
tags:
......
/source/direction/ @markpundsack @jobv
/source/handbook/product/ @markpundsack @jobv
/source/handbook/product/categories/ @markpundsack @JobV @edjdev @sytses
......@@ -16,6 +16,9 @@
- source: 'data/capabilities.yml'
public: 'handbook/product/categories/'
- source: 'data/sdlc.yml'
public: '/'
# Blogposts
- source: /source\/posts\/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.+?)\..*/ # source/posts/2017-01-30-around-the-world-in-6-releases.html.md.erb
public: '\1/\2/\3/\4/' # 2017/01/30/around-the-world-in-6-releases/
......
require 'scss_lint/rake_task'
require 'yaml'
require 'stringex'
require_relative './lib/competitor.rb'
desc 'Run all lint tasks'
task lint: ['lint:scss',
'lint:features:solutions',
'lint:competitors:categories',
'lint:events',
'lint:blog:categories',
'lint:roles_yml',
......@@ -22,34 +23,44 @@ namespace :lint do
Rake::Task['scss_lint'].invoke
end
namespace :features do
desc 'Ensure every feature has a solution'
task :solutions do
namespace :competitors do
desc "Ensure every competitor has at least one valid category"
task :categories do
failed = 0
categories = YAML.load_file('data/categories.yml')
puts ''
puts '=> Checking if a feature is missing a solution...'
file = YAML.load_file('data/features.yml')
file['features'].each do |feature|
if feature['solution'].nil?
puts "'#{feature['title']}'"
failed += 1
puts '=> Checking if every competitor has a valid category'
Gitlab::Homepage::Competitor.all!.each do |competitor|
next if competitor.gitlab?
# allow nil category
next unless competitor.category
# fail on nil category
# unless competitor.category
# puts competitor.key
# failed += 1
# next
# end
competitor.category.each do |category_key|
if categories.key?(category_key) == false
failed += 1
puts "#{competitor.key} has invalid category #{category_key}"
end
end
end
unless failed.zero?
puts '----------------------------'
if failed == 1
puts "Oops! #{failed} solution is missing :( Read how to fix this:"
puts "Oops! #{failed} competitor has an invalid category"
else
puts "Oops! #{failed} solutions are missing :( Read how to fix this:"
puts "Oops! #{failed} competitors have an invalid category"
end
puts 'https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/doc/features.md#create-or-update-the-solutions-pages-under-solutions'
exit 1
end
puts 'Every feature has a solution! Congrats!'
puts 'Every competitor has a valid category! Congrats!'
end
end
......@@ -444,6 +455,7 @@ end
PDFS = %w[
public/high-availability/gitlab-ha.pdf
public/pdfs/the-eleven-rules-of-gitlab-flow.pdf
public/enterprise-class/enterprise-considerations.pdf
].freeze
PDF_TEMPLATE = 'pdf_template.tex'.freeze
......@@ -463,8 +475,17 @@ rule %r{^public/.*\.pdf} => [->(f) { f.pathmap('%X.html') }, PDF_TEMPLATE] do |p
wq
REGEX
end
options = %W[--template=#{PDF_TEMPLATE} --latex-engine=xelatex -V date=#{Time.now}]
warn "Generating #{pdf.name}"
version_1 = `pandoc --version`.match(/^pandoc 1/)
options = %W[--template=#{PDF_TEMPLATE} -V date=#{Time.now}]
options <<
if version_1
"--latex-engine=xelatex"
else
"--pdf-engine=xelatex"
end
cmd = ['pandoc', *options, '-o', pdf.name, pdf.source]
abort("command failed: #{cmd.join(' ')}") unless system(*cmd)
end
......@@ -482,26 +503,14 @@ task :rm_pdfs do
end
end
# Used for old pages, can delete once we 301 redirect old content: https://gitlab.com/gitlab-com/www-gitlab-com/issues/2543
desc 'Comparison PDFS Old'
task :comparison_pdfs_old do
file = YAML.load_file('data/features.yml')
file['comparisons'].each_key do |key, comparison|
file_name = "public/comparison/pdfs/#{key.dup.tr('_', '-')}.html"
pdf_file_name = "source/comparison/pdfs#{comparison['link'].dup.gsub(/html/, 'pdf').gsub(%r{comparison/}, '')}"
abort('Error generating comparison PDFs 😔') unless system("./comparison_pdfs.sh #{file_name} #{pdf_file_name}")
end
end
desc 'Comparison PDFS'
task :comparison_pdfs do
file = YAML.load_file('data/features.yml')
file['competitors'].each_key do |key, competitor|
puts key
next if key[0..6] == 'gitlab_'
file_name = "public/comparison/pdfs/#{key.dup.tr('_', '-')}-vs-gitlab.html"
pdf_file_name = "source/comparison/pdfs/#{key.dup.tr('_', '-')}-vs-gitlab.pdf"
file_name = "public/devops-tools/pdfs/#{key.dup.tr('_', '-')}-vs-gitlab.html"
pdf_file_name = "source/devops-tools/pdfs/#{key.dup.tr('_', '-')}-vs-gitlab.pdf"
abort('Error generating comparison PDFs 😔') unless system("./comparison_pdfs.sh #{file_name} #{pdf_file_name}")
end
......
......@@ -93,26 +93,15 @@ end
org_chart = OrgChart.new
proxy '/team/chart/index.html', '/team/chart/template.html', locals: { team_data_tree: org_chart.team_data_tree }, ignore: true
# Proxy comparison PDF pages
# Used for old pages, can delete once we 301 redirect old content: https://gitlab.com/gitlab-com/www-gitlab-com/issues/2543
data.features.comparisons.each do |key, comparison|
file_name = key.dup.tr('_', '-')
proxy "/comparison/pdfs/#{file_name}.html", '/comparison/pdfs/template.html', locals: {
comparison_block: comparison,
key_one: comparison.product_one.to_sym,
key_two: comparison.product_two.to_sym
}, ignore: true
end
# Proxy Comparison html and PDF pages
data.features.competitors.each_key do |competitor|
next if competitor[0..6] == 'gitlab_'
file_name = "#{competitor}-vs-gitlab".tr('_', '-')
proxy "/comparison/#{file_name}.html", "/templates/comparison.html", locals: {
proxy "/devops-tools/#{file_name}.html", "/templates/comparison.html", locals: {
key_one: competitor,
key_two: 'gitlab_ultimate'
}
proxy "/comparison/pdfs/#{file_name}.html", '/comparison/pdfs/template.html', locals: {
proxy "/devops-tools/pdfs/#{file_name}.html", '/devops-tools/pdfs/template.html', locals: {
key_one: competitor,
key_two: 'gitlab_ultimate'
}, ignore: true
......
......@@ -7,5 +7,11 @@
- url: gartner-aro
title: "Gartner Application Release Orchestration Report"
subtitle: "GitLab and the Gartner Magic Quadrant for ARO 2018"
subtitle: "Gartner Cites GitLab as a Niche Player in MQ for ARO"
include_file: /analysts/includes/gartner-aro
- url: forrester-ci
title: "Forrester Continuous Integration Tools Report "
subtitle: "Forrester Cites GitLab As A Leader In CI Tools Evaluation"
form: 1002
include_file: /analysts/includes/forrester-ci
\ No newline at end of file
......@@ -156,7 +156,7 @@
- name: <a href="https://gitlab.com/groups/gitlab-org/-/epics/443">Runtime Application Self-Protection (RASP)</a> <kbd>Planned 2019</kbd>
- name: Distribution
dev_ops: dev
pm: Joshue Lambert
pm: Joshua Lambert
pmm: William Chia
engineering_manager: Marin Jankovski
frontend_engineering_manager: Clement Ho
......
......@@ -240,6 +240,8 @@ continuous_integration:
name: "Continuous Integration (CI)"
description: "Gain the confidence to ship at blistering speed and immense scale with automated builds, testing, and out-of-the-box security to verify each commit moves you forward."
stage: verify
link: /resources/forrester-wave-ci-2017/
link_description: "Top rated CI"
body: |
![GitLab CI/CD](/images/ci/ci-cd-test-deploy-illustration_2x.png)
......
......@@ -9,6 +9,7 @@
- Japan
- North Korea
- Portugal
- South Africa
- South Korea
- Spain
- Sudan
......
......@@ -635,7 +635,7 @@
date: December 11-13, 2018
date_ends: December 14, 2018
description: |
The Cloud Native Computing Foundation’s flagship conference gathers adopters and technologists from leading open source and cloud native communities in Seattle, WA on December 11-13, 2018. Join Kubernetes, Prometheus, OpenTracing, Fluentd, gRPC, containerd, rkt, CNI, Envoy, Jaeger, Notary, TUF, Vitess, CoreDNS, NATS, and Linkerd as the community gathers for three days to further the education and advancement of cloud native computing.
The Cloud Native Computing Foundation’s flagship conference gathers adopters and technologists from leading open source and cloud native communities in Seattle, WA on December 11-13, 2018. Join Kubernetes, Prometheus, OpenTracing, Fluentd, gRPC, containerd, rkt, CNI, Envoy, Jaeger, Notary, TUF, Vitess, CoreDNS, NATS, and Linkerd as the community gathers for three days to further the education and advancement of cloud native computing. This year we will have 3 Gitlabber's speaking at the event. [Monolith to Microservice: Pitchforks Not Included](https://kccna18.sched.com/event/GrSP?iframe=no) with Jason Plum. [Using Application Identity to Correlate Metrics: A look at SPIFFE and SPIRE](https://kccna18.sched.com/event/GrZW) with Priyanka Sharma. [Becoming Cloud Native Without Starting From Scratch](https://kccna18.sched.com/event/GrRC) with Marin Jankovski.
location: Seattle, WA USA
region: NORAM
social_tags: KubeCon
......
- title: "Project Management"
- title: "Git Repository Management"
- title: "CI/CD"
- title: "Administration"
- title: "Support"
- title: "Uptime & Scale"
- title: "Service Desk"
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -9,11 +9,21 @@ recent_news:
link: "https://www.reuters.com/article/us-gitlab-funding/coding-platform-gitlab-enters-unicorn-club-after-raising-100-million-idUSKCN1LZ2A2"
date: 2018-09-19
- title: "Investors are pouring money into developer startups so they can find a deal as good as Microsoft's $7.5 billion GitHub acquisition"
logo: /images/press/business-insider-logo.svg
link: "https://www.businessinsider.com/microsoft-github-silicon-valley-investors-2018-8?r=UK&IR=T"
date: 2018-08-31
- title: "Channeling Community Wisdom: Recent Open Source Momentum And What's To Come"
logo: /images/press/forbes-logo.svg
link: "https://www.forbes.com/sites/forbestechcouncil/2018/08/24/channeling-community-wisdom-recent-open-source-momentum-and-whats-to-come/#24cbdb0d2db1"
date: 2018-08-24
- title: "Jaguar Land Rover, BI Worldwide share GitLab migration pros and cons"
logo: /images/press/techtarget-logo.svg
link: "https://searchsoftwarequality.techtarget.com/news/252442884/Jaguar-Land-Rover-BI-Worldwide-share-GitLab-migration-pros-and-cons"
date: 2018-06-11
- title: "SD Times Open-Source Project of the Week: GNOME"
logo: /images/press/sdtimes-logo.svg
link: "https://sdtimes.com/os/sd-times-open-source-project-of-the-week-gnome/"
......@@ -85,6 +95,11 @@ recent_news:
date: 2018-03-26
podcasts:
- title: "GitLab CEO on competing with Microsoft, betting on Kubernetes and learning to scale"
logo: /images/press/libsyn-logo.png
link: "http://directory.libsyn.com/episode/index/id/6704664/tdest_id/502266"
date: June 2018
- title: "A Conversation with GitLab CEO Sid Sijbrandij"
logo: /images/press/devops-chat-logo.png
link: "https://soundcloud.com/devopschat/a-conversation-with-gitlab-ceo-sid-sijbrandij"
......
......@@ -385,3 +385,10 @@ gitlab-ui:
description: |
UI component library written in Vue.js.
Use https://gitlab-org.gitlab.io/gitlab-ui/ to see all the components
gitlab-eslint-config:
name: gitlab-eslint-config
path: gitlab-org/gitlab-eslint-config
link: https://gitlab.com/gitlab-org/gitlab-eslint-config
description: |
GitLab's eslint configuration
......@@ -3,54 +3,68 @@
# date: release date (YYYY-MM-DD)
# manager: manager handle
releases:
- version: "11.8"
date: "2018-1-22"
manager: --
structural_check: --
copy_edit: --
messaging: johnjeremiah
social: --
- version: "11.7"
date: "2018-1-22"
manager: --
structural_check: --
copy_edit: --
messaging: TinaS
social: --
- version: "11.6"
date: "2018-12-22"
manager: jlenny
structural_check: --
copy_edit: --
marketing: --
messaging: cblake
social: --
- version: "11.5"
date: "2018-11-22"
manager: bikebilly
structural_check: --
copy_edit: --
marketing: --
messaging: williamchia
social: --
- version: "11.4"
date: "2018-10-22"
manager: jramsay
structural_check: --
copy_edit: --
marketing: johnjeremiah
messaging: johnjeremiah
social: --
- version: "11.3"
date: "2018-09-22"
manager: danielgruesso
structural_check: marcia
copy_edit: rebecca
marketing: TinaS
messaging: TinaS
social: marcia
- version: "11.2"
date: "2018-08-22"
manager: mikelewis
structural_check: axil
copy_edit: rebecca
marketing: cblake
messaging: cblake
social: jjcordz
- version: "11.1"
date: "2018-07-22"
manager: akaemmerle
structural_check: mikelewis
copy_edit: rebecca
marketing: williamchia
messaging: williamchia
social: evhoffmann
- version: "11.0"
date: "2018-06-22"
manager: marcia
structural_check: marcia
copy_edit: rebecca
marketing: johnjeremiah
messaging: johnjeremiah
social: marcia
- version: "10.8"
date: "2018-05-22"
......@@ -109,6 +123,12 @@ managers:
- handle: axil
name: "Axil"
team_page: "_axil"
- handle: erica
name: "Erica"
team_page: "EricaLindberg_"
- handle: eread
name: "Evan"
team_page: eread
- handle: bikebilly
name: "Fabio"
team_page: "bikebilly"
......
- name: GitLab 11.4 - Collaboration
dates:
- date: North America - TBD
region: North America
time: TBD
- date: EMEA - TBD
region: EMEA
time: TBD
image: /images/webcast/11_4-release-radar.svg
tagline: "Accelerate software delivery through the power of collaboration"
description:
- "Whether you’re a developer, an engineer, a product manager, a security expert, or a UX designer, you often need to collaborate cross-functionally to get work done. At GitLab, we set out to create an application that will help teams collaborate and work together more efficiently."
- "In our latest release, we build on ‘Code Owners’ from the 11.3 release by introducing Suggested Approvers. With Suggested Approvers, GitLab will suggest who should review and approve a specific merge request based on the code owners file. This way, you can quickly and efficiently get changes reviewed and approved. We also added File Tree view to the merge request to make it easier and faster for reviewers to navigate through multiple changed files and provide their feedback. Finally, we introduced Batch Comments to help reduce noise from comments on merge request so people subscribed to the project can keep track of changes more efficiently."
- "Join us for a live broadcast to learn more about GitLab’s latest enhancements including a preview on File Tree View and Batch Comments."
form: 1419
what_we_cover:
- "File Tree View"
- "Batch Comments"
- "Suggested Approvers"
youtube_url: ""
- name: GitLab 11.3 - Governance
dates:
- date: North America - October 4
......@@ -18,7 +40,7 @@
- "Code Owners"
- "Protected Environments"
- "Epic forecasting"
youtube_url: ""
youtube_url: "https://www.youtube.com/embed/3CVpejJQpyE"
- name: GitLab 11.2 - Get started and iterate faster
dates:
......
......@@ -5,14 +5,14 @@
paid-main-features:
- title: GitLab
logo: includes/logos/logo_sq.svg
monthly_price: 1659
monthly_price: 1900
free-features:
- title: GitLab Issues
- title: GitLab Issue Boards
- title: Premium Support
- title: GitLab CI/CD
- title: GitLab Container Registry
- title: Security Testing
# - title: Security Testing
bonus-features:
- title: Cycle Analytics
- title: Performance Monitoring
......@@ -36,9 +36,9 @@
- title:
logo: includes/icons/third-party/docker-hub.svg
monthly_price: 100
- title: Fortify
logo: includes/icons/third-party/fortify-logo.svg
monthly_price: 1830
# - title: Fortify
# logo: includes/icons/third-party/fortify-logo.svg
# monthly_price: 1830
- name: atlassian
title: Atlassian
......@@ -64,6 +64,6 @@
- title: Premier Support
logo: includes/icons/third-party/atlassian-icon.svg
monthly_price: 2917
- title: Fortify
logo: includes/icons/third-party/fortify-logo.svg
monthly_price: 1830
# - title: Fortify
# logo: includes/icons/third-party/fortify-logo.svg
# monthly_price: 1830
......@@ -27,7 +27,7 @@ questions:
- question: What is the difference between GitLab and (other Git solution)?
answer: |
You can see all the differences between GitLab and other popular Git solutions on
<a href="https://about.gitlab.com/comparison/">our comparison page</a>.
<a href="https://about.gitlab.com/devops-tools/">our comparison page</a>.
- question: Do you offer any discounts for GitLab?
answer: |
GitLab Core is open source and completely free for anyone to use. We don’t
......@@ -43,5 +43,5 @@ questions:
<a href="https://docs.gitlab.com/ee/update/README.html#community-to-enterprise-edition">guides in our documentation</a>.
- question: As an unofficial reseller, what happens after I place an order on behalf of my customers?
answer: |
GitLab will process the order and send the customer a EULA request directly to the email address provided.
GitLab will process the order and send the customer a EULA request directly to the email address provided.
Once they have accepted the terms of the EULA, the license key will be sent directly to them.
\ No newline at end of file
- phase: Manage
link: /product/manage/
vision: /direction/product-vision/#manage
established:
year: 2016
link: "https://gitlab.com/groups/gitlab-org/-/roadmap?label_name%5B%5D=devops%3Amanage&scope=all&sort=end_date_asc&state=opened&layout=QUARTERS"
competitors:
- name: CA Agile Central
logo: /images/comparison/ca-agile-central.png
link: /comparison/ca-agile-central-vs-gitlab.html
- name: Version One
logo: /images/comparison/Collabnet-VersionOne.png