Commit f379d4b4 authored by Matt Vanderpol's avatar Matt Vanderpol

Merge branch 'master' into 3063-roi-calc-with-choose-tools

parents 290ca13d c4196797
......@@ -78,6 +78,11 @@ bundle exec rake pdfs
The above command builds the static files and PDFs into the folder `public`.
Due to the number of API requests necessary for generating the Direction page,
the results of those requests are cached for 36 hours. If you need the page to
be updated earlier than that, provide the `CLEAR_DIRECTION_CACHE` [environment
variable](https://docs.gitlab.com/ee/ci/pipelines.html#manually-executing-pipelines).
## Custom Generators
There are a few custom, static generators specified in `config.rb`. For
......
title: Cern
title: CERN
cover_image: '/images/blogimages/cern.jpg'
cover_title: |
Particle physics laboratory uses GitLab to connect researchers from across the globe
......
......@@ -2133,7 +2133,7 @@
start_date: 2016-09-26
locality: Lancaster, Pennsylvania
country: USA
role: <a href="/job-families/engineering/backend-engineer/#distribution">Senior Software Engineer, Distribution</a>
role: <a href="/job-families/engineering/backend-engineer/#distribution">Senior Distribution Engineer</a>
reports_to: marin
picture: jplum.jpg
twitter: WarheadsSE
......@@ -2213,7 +2213,7 @@
start_date: 2016-10-17
locality: Hutchinson, MN
country: USA
role: <a href="/job-families/engineering/backend-engineer/#distribution">Senior Software Engineer, Distribution</a>
role: <a href="/job-families/engineering/backend-engineer/#distribution">Senior Distribution Engineer</a>
reports_to: marin
picture: ibaum.jpg
twitter:
......@@ -2474,7 +2474,7 @@
start_date: 2016-11-16
locality: Kochi, Kerala
country: India
role: <a href="/job-families/engineering/backend-engineer/#distribution">Software Engineer, Distribution</a>
role: <a href="/job-families/engineering/backend-engineer/#distribution">Distribution Engineer</a>
reports_to: marin
picture: balasankarc.jpg
twitter: cbalasankar
......@@ -4152,7 +4152,7 @@
start_date: 2018-01-01
locality: Cairo
country: Egypt
role: <a href="/job-families/engineering/backend-engineer/#distribution">Software Engineer, Distribution</a>
role: <a href="/job-families/engineering/backend-engineer/#distribution">Distribution Engineer</a>
reports_to: marin
picture: ahmad-hassan.jpg
twitter: zeepatriot
......@@ -6703,7 +6703,7 @@
start_date: 2018-08-14
locality: Tampa, Florida
country: USA
role: <a href="/job-families/engineering/backend-engineer/#distribution">Software Engineer, Distribution</a>
role: <a href="/job-families/engineering/backend-engineer/#distribution">Distribution Engineer</a>
reports_to: marin
picture: robertmarshall.jpg
twitter:
......@@ -6999,20 +6999,22 @@
story: |
Joining October 8th
- slug: exec-assist
- slug: cheri-holmes
type: person
name: C.H.
start_date:
locality:
country:
name: Cheri Holmes
start_date: 2018-10-15
locality: Dublin,CA
country: USA
role: <a href="/job-families/people-ops/executive-assistant/">Executive Assistant</a>
reports_to: barbie
picture: ../gitlab-logo-extra-whitespace.png
gitlab:
picture: cheriholmes.jpg
gitlab: cheriholmes
departments:
- People Ops
story: |
Joining Oct 15th
Cheri is an Executive Assistant who believes in going beyond the call of duty. She's always looking for opportunities to collaborate, finding ways to streamline a process, and enjoys new challenges. She is passionate about providing seamless support to the team here at GitLab and brings 10+ years of experience to the role. She prides herself in being a scheduling wizard, event guru and MacGyver of all things Admin!
Based in the East Bay, CA. In her spare time she enjoys spontaneous trips to Disneyland with her family, baking, reading, and unlimited amounts of coffee.
- slug: tony-carella
type: person
......@@ -7031,6 +7033,24 @@
story: |
Tony has been merging the world of security and data science for the past several years. In his roles as a security engineer he has leveraged data to maximize efficiency, make informed decisions, and set obtainable goals. Originally from Toronto, Tony currently lives in Cincinnati, Ohio with his girlfriend and their miniature poodle.
- slug: henrip
type: person
name: H.P.
start_date:
locality:
country:
role: <a href="/job-families/engineering/site-reliability-engineer/">Senior Site Reliability Engineer</a>
reports_to:
picture: ../gitlab-logo-extra-whitespace.png
twitter:
gitlab:
departments:
- Engineering
- Product Development
- Infrastructure
story: |
Joining Nov 1st
- slug: eng-manager-gitaly
type: vacancy
name: New Vacancy - Tommy M. (Interim)
......@@ -8315,7 +8335,7 @@
twitter: sarah_harkness
gitlab: sharkness
departments:
- Sales
- 5 min w/
story: Sharky is a cloud technology-addicted sales leader who is passionate about tools that democratise our work lives. She likes to spend everyday making people's jobs and lives easier by implementing the right tools that promote collaboration, creativity and doing your best work. She has two babies and a dog named Wilson.
- slug: sal
......
......@@ -37,6 +37,8 @@ class GitLabInstance
end
@name = name
cache_store.clear if ENV.key?('CLEAR_DIRECTION_CACHE')
end
def get(path, params = {})
......@@ -86,7 +88,7 @@ class GitLabInstance
def cache_store
@cache_store ||= ActiveSupport::Cache::FileStore.new(
File.expand_path('../tmp/cache/direction', __dir__),
expires_in: 36.hours.to_i
expires_in: 24.hours.to_i
)
end
end
......
......@@ -132,6 +132,21 @@ What better way to convey a sense of who we are and how we work together, than b
<br>
### So that's what it's like to work at GitLab...
<div class="row">
<div class="col-sm-8 col-xm-12">
<figure class="video_container">
<iframe src="https://youtube.com/embed/4BIsON95fl8?t=1143" frameborder="0" allowfullscreen="true"> </iframe>
</figure>
</div>
<div class="col-sm-4 col-xm-12">
<p class="justify">Being new to GitLab, our CRO, Michael McBride joined Sid in meeting with customers in New York City, USA where customers got a glimpse of what it's like to work at GitLab for him</p>
</div>
</div>
<br>
<!-- particular styles for the pictures and video at the beginning -->
<style>
......
......@@ -60,19 +60,19 @@ DevOps lifecycle and the flows and feedback loops within the Create stage too.
## Upcoming
- **Q4 2018**
- ❤️ [Batch comments](https://gitlab.com/groups/gitlab-org/-/epics/23)
- ❤️ [Batch comments](https://gitlab.com/groups/gitlab-org/-/epics/23) – released [GitLab 11.4](/2018/10/22/gitlab-11-4-released/#merge-request-reviews)
- 🌊 [File tree](https://gitlab.com/gitlab-org/gitlab-ce/issues/14249) – released [GitLab 11.4](/2018/10/22/gitlab-11-4-released/#file-tree-for-browsing-merge-request-diff)
- 🌊 [Propose a change inline in a merge request](https://gitlab.com/gitlab-org/gitlab-ce/issues/18008)
- [Code owners](https://gitlab.com/groups/gitlab-org/-/epics/77)
- [Approver groups](https://gitlab.com/gitlab-org/gitlab-ee/issues/1979)
- 🌊 [File tree](https://gitlab.com/gitlab-org/gitlab-ce/issues/14249)
- **Q1 2019**
- ❤️ [Multiple assignees](https://gitlab.com/gitlab-org/gitlab-ee/issues/2004)
- 🌊 [Propose a change inline in MR](https://gitlab.com/gitlab-org/gitlab-ce/issues/18008)
- [Group merge request](https://gitlab.com/gitlab-org/gitlab-ee/issues/3427)
- ✌️🌊 [Code review on any line on any file in a merge request](https://gitlab.com/groups/gitlab-org/-/epics/19)
- ❤️ [Multiple assignees](https://gitlab.com/gitlab-org/gitlab-ee/issues/2004)
- ✌️ [Smarter squash and merge](https://gitlab.com/gitlab-org/gitlab-ce/issues/47149)
- [Web IDE: live preview](https://gitlab.com/groups/gitlab-org/-/epics/170)
- **Q2 2019**
- ✌️❤️ [Commit messages as part of code review](https://gitlab.com/groups/gitlab-org/-/epics/286)
- ✌️🌊 [Code review everywhere](https://gitlab.com/groups/gitlab-org/-/epics/19)
- ✌️ [API for line by line code quality feedback](https://gitlab.com/gitlab-org/gitlab-ce/issues/50299)
- Forking
- [compare branches](https://gitlab.com/gitlab-org/gitlab-ce/issues/19788)
......
......@@ -86,6 +86,12 @@ Technical Account Managers will typically manage customer engagements via a GitL
2. Go to the [customer collaboration project template project](https://gitlab.com/gitlab-com/account-management/customer-collaboration-project-template).
3. Follow the steps in the PLEASE-READ-THESE-INSTRUCTIONS.md file
### Using the customer project for communication
Once a customer project is setup and all principles have been invited, it is more convenient as the primary method of communication rather than email. Issues should be created for meetings and tasks. This makes it easier for the TAM to include other GitLab employees and is a more transparent communication model than email.
If the customer wants to use email, GitLab's Service Desk feature should be enabled which will allow the automatic creation of issues based on the email.
**Please NOTE**: The customer project is **not** to be used for support requests. Anything requiring communication with a GitLab support engineer should be initiated via the Support Portal or the designated support email address.
### Where does a Technical Account Manager fit in?
During the pre-sales process, a Solutions Architect owns the project with assistance from the Strategic Account Leader and should include the Implementation Engineer if there is one assigned. During the pre-sales project, a Technical Account Manager is involved but only for visibility. Until the account becomes a paying customer, the project remains in pre-sales. Once the customer has paid, the Strategic Account Leader will set up the Welcome to GitLab call along with the key GitLab employees (SAL, SA, IE and Technical Account Manager) and the customer. There is a preloaded issue for this in the project template.
......
......@@ -121,7 +121,8 @@ If a flight was changed or not taken due to delays or other circumstances, make
## Scheduling preferences for Sid Sijbrandij, CEO
* Don't schedule over the Infrastucture team call or the Weekly E-group call unless approved
* Don't schedule over the Weekly E-group call unless approved by Sid
* When our Sr. Dir. of Legal requests a meeting it will always override other meetings that are scheduled if urgent
* Mark the events listed in [Google Calendar section](/handbook/communication/#google-calendar) of the handbook as 'Private'
* The [agenda](https://docs.google.com/document/d/187Q355Q4IvrJ-uayVamoQmh0aXZ6eixAOE90jZspAY4/edit?ts=574610db&pli=1) of items to be handled by Sid's EA
* Monthly video calls are 25 minutes while quarterly calls/dinners are scheduled for 90 minutes plus any necessary travel time.
......
......@@ -25,7 +25,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td><b>Legal</b></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Operating Expenses</b></td>
<td colspan="8" align="center"><b>Operating Expenses</b></td>
</tr>
<tr>
<td>Up to $10K</td>
......@@ -68,7 +68,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Capital Asset Additions</b></td>
<td colspan="8" align="center"><b>Capital Asset Additions</b></td>
</tr>
<tr>
<td>Up to $5K</td>
......@@ -111,7 +111,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Other Purchases</b></td>
<td colspan="8" align="center"><b>Other Purchases</b></td>
</tr>
<tr>
<td>Up to $5K</td>
......@@ -154,7 +154,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Legal Contracts</b></td>
<td colspan="8" align="center"><b>Legal Contracts</b></td>
</tr>
<tr>
<td>Standard Terms</td>
......@@ -207,7 +207,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td>Signs/Approves</td>
</tr>
<tr>
<td colspan="7" align="center"><b>Bad debt write-off</b></td>
<td colspan="8" align="center"><b>Bad debt write-off</b></td>
</tr>
<tr>
<td>Up to $10K</td>
......@@ -240,7 +240,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Compensation/Hiring - non-executive:</b></td>
<td colspan="8" align="center"><b>Compensation/Hiring - non-executive:</b></td>
</tr>
<tr>
<td>Initial hiring Budgeted</td>
......@@ -333,7 +333,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Benefit changes</b></td>
<td colspan="8" align="center"><b>Benefit changes</b></td>
</tr>
<tr>
<td></td>
......@@ -346,7 +346,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Employee Travel &amp; Entertainment</b></td>
<td colspan="8" align="center"><b>Employee Travel &amp; Entertainment</b></td>
</tr>
<tr>
<td>Non Billable Expenses:</td>
......@@ -389,7 +389,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Transfer of funds among GitLab entities</b></td>
<td colspan="8" align="center"><b>Transfer of funds among GitLab entities</b></td>
</tr>
<tr>
<td>Up to $250K</td>
......@@ -412,7 +412,7 @@ Our process for signing any contract is documented in [/handbook/signing-legal-d
<td></td>
</tr>
<tr>
<td colspan="7" align="center"><b>Treasury Management</b></td>
<td colspan="8" align="center"><b>Treasury Management</b></td>
</tr>
<tr>
<td colspan="4">Letters of Credit</td>
......
......@@ -131,7 +131,8 @@ title: "DevOps tools"
### Continuous Delivery/Deployment
- [Jenkins](jenkins/)
- [Spinnaker](https://www.spinnaker.io/)
- [Spinnaker](https://www.spinnaker.io/)
- [Armory](https://www.armory.io/)
- [Go CD](https://www.gocd.org/index.html)
- [Puppet Pipelines](https://puppet.com/products/puppet-pipelines)
- [Cloudbees Codeship](https://codeship.com/)
......
......@@ -3,7 +3,7 @@
.hero-container.flex-container.flex-column.full-width.justify-center
%a.hero-title.hero-cta{ href: "/customers/cern/" }
%h1
Cern uses GitLab to connect researchers from across the globe
CERN uses GitLab to connect researchers from across the globe
%p.hero-description
CERN is the European Organization for Nuclear Research. Using highly sophisticated instruments, the organization’s physicists and engineers study the fundamental particles that are the building blocks of the universe.
%a.btn.cta-btn.accent.hero-cta{href: "/pricing/"}
......
......@@ -24,7 +24,9 @@
%img.gitlab-logo{ src: "/images/devops-tools/gitlab-logo.svg" }
%p.font-bold
Since
#{stage.established}:
#{stage.established}
%br
we've built:
- category_keys_active = data.categories.keys.keep_if { |k| data.categories[k].stage == stage_key && data.categories[k].available && data.categories[k].available <= Date.today}
- category_keys_upcoming = data.categories.keys.keep_if { |k| data.categories[k].stage == stage_key && data.categories[k].available && data.categories[k].available >= Date.today}
- category_keys_active.each do |key|
......@@ -34,12 +36,12 @@
.future-categories
%p.font-bold
Coming
%a.font-bold{ href: "#{stage.roadmap}", target: "_blank" }
soon:
= succeed ':' do
%a.font-bold{ href: "#{stage.vision}", target: "_blank" } soon
- category_keys_upcoming.each do |key|
%p
- url = data.categories[key].alt_link ? data.categories[key].alt_link : "/product/#{key.tr('_', '-').downcase}/"
%a.future-category{ href: "#{url}" } #{data.categories[key].name}
%a.future-category{ href: "#{url}", target: "_blank" } #{data.categories[key].name}
%tr.separate-application-row
- Gitlab::Homepage::Stage.all!.each do |stage|
......
......@@ -103,7 +103,7 @@ extra_js:
%li
%p.text-center
%a.btn.cta-btn.accent.margin-top20{href: "/upgrade-to-package-repository/"}
Upgrade to a package manger from Omnibus
Upgrade to a package manager from Omnibus
.method
.method-content
%h2.block-title Third-party applications that support GitLab
......
......@@ -1676,14 +1676,6 @@ iframe {
flex-direction: column;
align-items: center;
text-align: center;
.future-category {
color: $color-gray;
&:hover {
color: $color-primary;
}
}
}
.year-established {
......
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