Merge branch 'master' of gitlab.com:gitlab-com/www-gitlab-com

data/features.yml

@@ -216,7 +216,7 @@ features:
     link:
     gitlab_com: true
     github_com: false
-    bitbucket_org: 'sortof'
+    bitbucket_org: 'partially'
     bitbucket_server: false
   - title: "Commit graph and reporting tools"
     description: "GitLab provides commit graphs and reporting tools about collaborators' work."
@@ -252,7 +252,7 @@ features:
     description: "GitLab is meant to be the best place for any software project. The team behind GitLab is addressing issues that maintainers and contributors to large open source projects are facing, to make it easier to do both."
     link_description: "Making GitLab better for large open source projects"
     link: https://about.gitlab.com/2016/01/15/making-gitlab-better-for-large-open-source-projects/
-    gitlab_com: 'sortof'
+    gitlab_com: 'partially'
     github_com: true
   - title: "The most comprehensive import feature set"
     description: "GitLab can import projects and issues from more sources (GitHub, BitBucket, Google Code, FogBugz, Gitea and from any git URL) than GitHub or any other VCS. We even have you covered for your move from SVN to Git with comprehensive guides and documentation."
@@ -388,7 +388,7 @@ features:
     gitlab_eep: true
     gitlab_com: true
     gitlab_self_hosted: true
-    github_com: 'sortof'
+    github_com: 'partially'
     bitbucket_org: false
     bitbucket_server: false
   - title: "Drag and drop tasks"
@@ -553,8 +553,8 @@ features:
     gitlab_ees: true
     gitlab_eep: true
     gitlab_com: true
-    github_enterprise: 'sortof'
-    github_com: 'sortof'
+    github_enterprise: 'partially'
+    github_com: 'partially'
   - title: "Confidential Issues"
     description: "Keep your information secure with Confidential Issues. With GitLab, you can create confidential issues visible only for project members with Reporter access level or above."
     link_description: "Learn more about Confidential Issues"
@@ -1102,7 +1102,7 @@ features:
     gitlab_ci: true
     travis_ci: true
     jenkins: false
-    circle_ci: 'sortof'
+    circle_ci: 'partially'
   - title: "Minimal build configuration"
     description: "GitLab CI requires less configuration for your builds than a similar Jenkins setup."
     link_description: ""
@@ -1212,7 +1212,7 @@ features:
     gitlab_ce: false
     gitlab_ees: true
     gitlab_eep: true
-    jenkins: 'sortof'
+    jenkins: 'partially'
     circle_ci: false
     roi_case: "Allow automatic code quality checks and feedback directly in the MR, saving time checking them manually, for each MR."
     shorthand: codequality
@@ -1229,7 +1229,7 @@ features:
     gitlab_ees: false
     gitlab_eep: true
     travis_ci: false
-    jenkins: 'sortof'
+    jenkins: 'partially'
     circle_ci: false
     roi_case: "Prevent from manually check relationships and status of related projects, saving time doing cross-project content switch."
     shorthand: multiproject_pipelines
@@ -1471,7 +1471,7 @@ features:
     link_description: |
         <i class="fa fa-file-image-o" aria-hidden="true" style="font-size: .9em"></i> View side-by-side comparison
     gitlab_merge_requests: true
-    github_pull_requests: 'sortof'
+    github_pull_requests: 'partially'
   - title: "Edit merge request"
     description: "GitLab Merge Requests are editable by the author, the project's owners and users with master access. Every field is editable, as well as the target branch."
     link: 'https://docs.gitlab.com/ee/user/project/merge_requests/'
@@ -1635,20 +1635,20 @@ features:
     description: "With GitLab your entire team has access to the project's Issue Boards."
     gitlab_issue_boards: true
     asana: true
-    trello: 'sortof'
+    trello: 'partially'
   - title: "Multiple Issue Boards"
     description: "Asana let's you create multiple tasks lists. GitLab Multiple Issue Boards, available on GitLab Enterprise Edition, also makes it possible, improving your workflow by grouping different lists in multiple boards."
     link_description: "Learn more about Multiple Issue Boards"
     link: 'https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards'
     gitlab_issue_boards: true
-    asana: 'sortof'
+    asana: 'partially'
     trello: true
   - title: "Create new issues from the board"
     description: "With GitLab Issue Boards, you can create issues directly from the board and assign multiple labels allowing them to appear on multiple boards. With Asana you can create new tasks from each list but not assign them to multiple lists."
     link_description: "Learn how to create a new issue from the Issue Board"
     link: 'https://docs.gitlab.com/ee/user/project/issues/create_new_issue.html#new-issue-from-the-issue-board'
     gitlab_issue_boards: true
-    asana: 'sortof'
+    asana: 'partially'
     trello: false
   - title: "Built-in your software development platform"
     description: "There's no need to configure or integrate anything, GitLab Issue Boards are built-in GitLab. Asana is a third-party tool that optionally integrates with GitHub via Asana PowerUps. Note that you only have access to one PowerUp per Asana free account."

data/mvps.yml

+- version: "9.3"
+  name: Huang Tao
+  date: June 22nd, 2017
 - version: "9.2"
   name: Dosuken Shinya
   date: May 22nd, 2017

doc/features.md

@@ -95,6 +95,9 @@ There are 2 files in total which you need to create or update:
           as one paragraph.
         link_description: "Learn more about Feature Name."
         link: "link to GitLab's feature page documentation or blog post"
+        gitlab_ce: true
+        gitlab_ees: true
+        gitlab_eep: true
         gitlab_com: true
         github_com: true
     ```
@@ -109,7 +112,7 @@ There are 2 files in total which you need to create or update:
         `source/images/comparison/competitor-logo.svg`.
       - In the features area, `product_one` is always GitLab, and `product_two`
         is the competitor we are comparing against. Values for these two fields are
-        `true|false|sortof`.
+        `true|false|partially`.
 2. Add a new haml file named after the comparison using dashes:
    `source/comparison/gitlab-vs-competitor.html.haml`. You can start by copying

source/comparison/pdfs/template.html.haml

@@ -62,14 +62,14 @@ layout: false
                       %p
                         = link_to feature.link_description, feature.link
                     %td.check-container.text-center
-                      - if (feature.public_send(key_one) == "sortof")
+                      - if (feature.public_send(key_one) == "partially")
                         = partial "includes/icons/comparison/maybe-icon.svg"
                       - if (feature.public_send(key_one) == true)
                         = partial "includes/icons/comparison/yes-icon.svg"
                       - if (feature.public_send(key_one) == false)
                         = partial "includes/icons/comparison/no-icon.svg"
                     %td.check-container.text-center
-                      - if (feature.public_send(key_two) == "sortof")
+                      - if (feature.public_send(key_two) == "partially")
                         = partial "includes/icons/comparison/maybe-icon.svg"
                       - if (feature.public_send(key_two) == true)
                         = partial "includes/icons/comparison/yes-icon.svg"

source/includes/comparison_table.html.haml

@@ -55,14 +55,14 @@
             %p
               = link_to feature.link_description, feature.link
           %td.check-container.text-center
-            - if (feature.public_send(key_one) == "sortof")
+            - if (feature.public_send(key_one) == "partially")
               = partial "includes/icons/comparison/maybe-icon.svg"
             - if (feature.public_send(key_one) == true)
               = partial "includes/icons/comparison/yes-icon.svg"
             - if (feature.public_send(key_one) == false)
               = partial "includes/icons/comparison/no-icon.svg"
           %td.check-container.text-center
-            - if (feature.public_send(key_two) == "sortof")
+            - if (feature.public_send(key_two) == "partially")
               = partial "includes/icons/comparison/maybe-icon.svg"
             - if (feature.public_send(key_two) == true)
               = partial "includes/icons/comparison/yes-icon.svg"

source/includes/features/matrix-row.html.haml

@@ -12,21 +12,21 @@
         - else
           = link_to "Feature details", feature.link
   %td.check-container.text-center
-    - if (feature.public_send(key_one) == "sortof")
+    - if (feature.public_send(key_one) == "partially")
       = partial "includes/icons/comparison/maybe-icon.svg"
     - if (feature.public_send(key_one) == true)
       = partial "includes/icons/comparison/yes-icon.svg"
     - if (feature.public_send(key_one) == false)
       = partial "includes/icons/comparison/no-icon.svg"
   %td.check-container.text-center
-    - if (feature.public_send(key_two) == "sortof")
+    - if (feature.public_send(key_two) == "partially")
       = partial "includes/icons/comparison/maybe-icon.svg"
     - if (feature.public_send(key_two) == true)
       = partial "includes/icons/comparison/yes-icon.svg"
     - if (feature.public_send(key_two) == false)
       = partial "includes/icons/comparison/no-icon.svg"
   %td.check-container.text-center
-    - if (feature.public_send(key_three) == "sortof")
+    - if (feature.public_send(key_three) == "partially")
       = partial "includes/icons/comparison/maybe-icon.svg"
     - if (feature.public_send(key_three) == true)
       = partial "includes/icons/comparison/yes-icon.svg"

source/includes/positions/community-advocate/_description.haml

 :markdown
-  ## Role
   As a Gitlab Community Advocate, you will be a member of
   the Community Advocacy team within Developer Relations

source/includes/positions/people-operations/_generalist.haml

@@ -3,13 +3,13 @@
   People Ops Generalists meet the additional requirements of People Ops Specialist and have the following advanced responsibilities:
-  - Assist the Sr. Director of People Operations to develop the strategic direction for People Ops, and implement the functional steps to achieve those goals.
+  - Assist the VP of People Operations to develop the strategic direction for People Ops, and implement the functional steps to achieve those goals.
   - Develop and implement HR policies, from recruitment and pay, to diversity and employee relations.
   - Work with People Ops and the executive team to establish entities in new countries as we scale.
   - Develop contracts and benefits programs for each entity.
   - Assist and advise managers in delicate and difficult People Operations issues (special circumstances, conflicts, sickness, layoffs, etc.)
   - Meet with managers on a regular basis to discuss their needs within the organization and any issues.
-  - Work with the Sr. Director of People Operations to develop leadership and individual contributor training.
+  - Work with the VP of People Operations to develop leadership and individual contributor training.
   - Create People Operations processes and strategies following the GitLab workflow, with the goal always being to make things easier from the perspective of the team members.
   - Keep it efficient and DRY.
   - Provide assistance to the team with miscellaneous support tasks.

source/includes/positions/people-operations/_requirements.haml

@@ -15,3 +15,4 @@
   * Willing to make People Operations as open and transparent as possible
   * Wanting to work for a fast moving startup
   * You share our [values](/handbook/values), and work in accordance with those values
+  * Successful completion of a [background check](/handbook/people-operations/#background-checks).

source/includes/positions/people-operations/_specialist.haml

@@ -2,7 +2,7 @@
   ## People Ops Specialist
   - Responsible for the day to day administration of People Operations and assisting team members with their People Operations questions.
-  - Assist the Sr. Director of People Operations with the implementation of programs aligned with the strategic direction of the organization.
+  - Assist the VP of People Operations with the implementation of programs aligned with the strategic direction of the organization.
   - Develop and implement HR policies, from recruitment and pay, to diversity and employee relations.
   - Coordinate with our payroll and benefits providers, and using our People Ops Information System and ATS; currently BambooHR and Workable.
   - Create People Operations processes and strategies following the GitLab workflow, with the goal always being to make things easier from the perspective of the team members.
@@ -11,10 +11,7 @@
   - Suggest and implement improvements to People Operations policies, processes and procedures.
   - Help write job descriptions and promotion criteria.
   - Maintain our HRIS system, ensuring Data Integrity and alignment with all ancillary systems, such as Grovo, Lattice and Finance.
-  - Where applicable, work with the Sr. Director of People Operations on compensation strategies and principles.
-
-  ## Additional Requirements
-
-  - Clear understanding of HR laws in one or multiple countries where GitLab is active
-  - Ability to work strange hours when needed (for example, to call an embassy in a different continent)
-  - Proven experience quickly learning new software tools
+  - Where applicable, work with the VP of People Operations on compensation strategies and principles.
+  - Must have clear understanding of HR laws in one or multiple countries where GitLab is active
+  - Must be able to work strange hours when needed (for example, to call an embassy in a different continent)
+  - Has proven experience quickly learning new software tools

source/includes/positions/technical-writer/_description.haml

-:markdown
-
-  The main difference between full and junior technical writers is their ability
-  to proactively and independently take on tasks to improve technical writing
-  assets.

source/includes/positions/technical-writer/_junior.haml

@@ -2,6 +2,6 @@
   ## Junior
-  Junior technical writers have similar responsibilities as outlined above,
-  but typically join with less experience in technical writing for similar
-  products.
+  Junior technical writers have similar responsibilities as outlined above, but typically join with less experience in technical writing for similar products.
+  
+  The main difference between full and junior technical writers is their ability to proactively and independently take on tasks to improve technical writing assets.

source/jobs/community-advocate/index.html.md

@@ -3,6 +3,10 @@ layout: job_page
 title: "Community Advocate"
 ---
+#### **This job is being moved to [/positions/community-advocate/](/positions/community-advocate/)**
+{: .text-center}
+<br>
+
 ## Role
 As a Gitlab Community Advocate, you will be a member of
@@ -17,10 +21,10 @@ feedback into GitLab.
 - Respond to the GitLab community across the following channels in a timely manner: Twitter, Disqus, Facebook, StackOverflow, Reddit, Quora, Google alerts, HackerNews, comments on news stories in the media, [forum.gitlab.com](https://forum.gitlab.com), and more.
 - Engage with the developer community in a way that is direct but friendly and authentic. Be able to carry the tone of the GitLab brand while also giving the proper answers or direction to members of the community.
-- Help update the [social media guidelines](/handbook/marketing/social-media-guidelines/) and GitLab voice as new situations arise. 
+- Help update the [social media guidelines](/handbook/marketing/social-media-guidelines/) and GitLab voice as new situations arise.
 - Work with leadership to find a way to track and measure response time across all channels with the ideal response time being under 1 hour for all channels by the end of Q1, 2017.
 - Explore different tools from Zendesk to Mentions to find a way to track all mentions of GitLab across the internet.
-- Don’t be afraid of animated gifs and well-placed humor! We are not robots. 
+- Don’t be afraid of animated gifs and well-placed humor! We are not robots.
 - Work within the GitLab process to help users report bugs, make feature requests, contact support, and provide feedback to the product.
 ## Requirements for Applicants
@@ -33,7 +37,7 @@ feedback into GitLab.
 - Accurate, nuanced, direct, and kind messaging.
 - Being able to work independent and respond quickly.
 - Able to articulate the GitLab mission, values, and vision.
-- Understand the difference between different online developer communities 
+- Understand the difference between different online developer communities
 - You LOVE working with the GitLab community.
 ## Relevant links
@@ -42,4 +46,3 @@ feedback into GitLab.
 - [Developer Advocacy Handbook](/handbook/marketing/developer-relations/developer-advocacy/)
 ----
-

source/jobs/people-ops-administrator/index.html.md

@@ -3,6 +3,10 @@ layout: job_page
 title: "People Operations Administrator"
 ---
+#### **This job is being moved to [/positions/people-operations/](/positions/people-operations/)**
+{: .text-center}
+<br>
+
 This role reports to the Senior Director of People Operations and works daily to support the recruiting team.
 ## Responsibilities

source/jobs/people-ops-generalist/index.html.md

@@ -3,6 +3,10 @@ layout: job_page
 title: "People Operations Generalist"
 ---
+#### **This job is being moved to [/positions/people-operations/](/positions/people-operations/)**
+{: .text-center}
+<br>
+
 ## Responsibilities
 - Assist the Sr. Director of People Operations to develop the strategic direction for People Ops, and implement the functional steps to achieve those goals.

source/jobs/people-ops-specialist/index.html.md

@@ -3,6 +3,10 @@ layout: job_page
 title: "People Operations Specialist"
 ---
+#### **This job is being moved to [/positions/people-operations/](/positions/people-operations/)**
+{: .text-center}
+<br>
+
 ## Responsibilities
 - Responsible for the day to day administration of People Operations and assisting team members with their People Operations questions.

source/jobs/technical-writer/index.html.md

@@ -3,6 +3,10 @@ layout: job_page
 title: "Technical Writer"
 ---
+#### **This job is being moved to [/positions/technical-writer/](/positions/technical-writer/)**
+{: .text-center}
+<br>
+
 The main difference between full and junior technical writers is their ability
 to proactively and independently take on tasks to improve technical writing
 assets.

source/okrs/index.html.md

@@ -119,7 +119,7 @@ TODO: Link to Diff with the start of the quarter
       * CMO: [Presentation generation based on conversational development index.](https://gitlab.com/gitlab-com/organization/issues/95)
       * CMO: 3 minute video product demo targeted at buyer audience. Published
     * PMM: Sales Demo easy to give. At least one Account Executive can do it in 10 minutes.
-    * CRO: Sales Demo trained. 75% of customer facing team passes test.
+    * CRO: Sales Pitch Deck and Messaging trained. 75% of customer facing team passes test.
     * VP Prod: Conversational Development Index in product and SFDC.
     * VP Prod: Improve JIRA support. Better than Bitbucket. Support transitions, references and development panel.
       * Technical writing: Create a page on our JIRA integration and how to move to Issues. 100% increased usage of JIRA integration.
@@ -230,7 +230,6 @@ TODO: Link to Diff with the start of the quarter
   * VP PO: Quicker hiring cycle (plan interviews upfront). Hiring time -25%
   * VP PO: Improve our global compensation framework. Structured on better data.
 * CEO: Retain great people. eNPS 0% change
-  * CRO: Sales training program to advance sales skills. 80% of sales people trained.
   * Customer Success: Hiring talent to plan and ramping up SA’s so that on day 31 they are certified and ready to be assigned to accounts.
   * Sr.Dir.PO: Improve diversity. Two initiatives deployed.
   * VP PO: Establish a performance management system consistent with the GitLab workflow.

source/positions/technical-writer/index.html.md.erb

@@ -4,7 +4,6 @@ title: "Technical Writer"
 salary: 65803
 ---
-<%= partial "includes/positions/technical-writer/description" %>
 <%= partial "includes/positions/technical-writer/responsibilities" %>
 <%= partial "includes/positions/technical-writer/requirements" %>