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

source/direction/index.md

@@ -145,6 +145,7 @@ in a way that all relevant parties get notified.
 - [Management dashboard](https://dev.gitlab.org/gitlab/gitlab-ee/issues/287)
 - [Highly Available (HA) Omnibus Packages](https://gitlab.com/gitlab-org/gitlab-ee/issues/77)
 - [Oracle support](https://gitlab.com/gitlab-org/gitlab-ee/issues/96)
+- [Group member activity](https://gitlab.com/gitlab-org/gitlab-ce/issues/3824)
 ### Software to ship in the Omnibus packages
@@ -157,7 +158,7 @@ in a way that all relevant parties get notified.
 - Browser IDE: Koding, Nitrous.io, [Cloud9](https://c9.io/blog/cloud9-template-days/), CodeAnywhere, Codio and CodeEnvy (ship GitLab with them and button to open from GitLab)
 - Configuration management: Upload cookbooks, manifests, playbooks, and modules for respectively Chef, Puppet, Ansible, and Salt.
-- Paas: Use [GitLab Deploy](https://gitlab.com/gitlab-org/gitlab-ce/issues/3286) to deploy to CloudFoundry, OpenStack, OpenShift, Kubernetes, Mesos DCOS, Docker Swarm, Atlas/Terraform, [Nomad](https://nomadproject.io/), [Deis](http://deis.io/), [Convox](http://www.convox.com/), [Flynn](https://flynn.io/) [Tutum](https://www.tutum.co/) [GiantSwarm](https://giantswarm.io/)
+- Paas: Use [GitLab Deploy](https://gitlab.com/gitlab-org/gitlab-ce/issues/3286) to deploy to CloudFoundry, OpenStack, OpenShift, Kubernetes, Mesos DCOS, Docker Swarm, Atlas/Terraform, [Nomad](https://nomadproject.io/), [Deis](http://deis.io/), [Convox](http://www.convox.com/), [Flynn](https://flynn.io/), [Tutum](https://www.tutum.co/), [GiantSwarm](https://giantswarm.io/), [Rancher](https://github.com/rancher/rancher/blob/master/README.md)
 - Scrum boards: [Huboard](https://huboard.com/), [Waffle.io](https://waffle.io/) and [Zenhub.io](https://www.zenhub.io/) support in addition to https://about.gitlab.com/applications/#scrum-boards
 ## Vision <a name="vision"></a>

source/handbook/hiring/index.md

@@ -80,9 +80,7 @@ title: "Hiring"
 1. What do you expect to achieve in your first month at GitLab?
 1. Where do you want to be in three years from now?
 1. Have you worked remote before and how do you feel about it?
-1. What are your idea's about compensation for this job?
-1. Are you afraid of flying?
-1. Do you smoke?
+1. What salary range would you feel comfortable with?
 1. If you get hired when can you start?
 1. Are you interviewing anywhere else?
 1. Do you have any questions for me?

source/team/index.html

@@ -162,7 +162,7 @@ team_members:
           Josh has been working in technology for the past 5 years including sales roles at Stack Overflow, Venture360, and Innovation Pavilion.  His passion for the tech space and following the latest in innovation makes him love his job.  Aside from working at GitLab, Josh is an avid sports fan and former hockey player.
           He is a Colorado native so he loves being outdoors and is excited to explore everything San Francisco has to offer.
-- name: Richard Pidgeon
+- name: Richard 'Pidge' Pidgeon
   role: Sales Director EMEA
   reports_to: CRO
   picture: richard.jpg

source/university/index.md

@@ -28,6 +28,9 @@ The following courses have been created to help you become better educated about
 - [About Version Control](https://docs.google.com/presentation/d/16sX7hUrCZyOFbpvnrAFrg6tVO5_yT98IgdAqOmXwBho/edit#slide=id.g72f2e4906_2_29)
 - [Take the Test](http://goo.gl/forms/8H8SNcH70T)
+#### Intro to Terminology
+- [GitLab Introduction to Terminology](https://about.gitlab.com/2015/05/18/simple-words-for-a-gitlab-newbie/)
+
 #### Intro to Git
 - [Intro to Git](https://www.codeschool.com/account/courses/try-git)
 - [Take the Test](http://goo.gl/forms/GgWF1T5Ceg)
@@ -48,32 +51,86 @@ The following courses have been created to help you become better educated about
 - [Gitlab Ecosystem Recording](https://drive.google.com/a/gitlab.com/file/d/0B41DBToSSIG_N0gzbEFMOVNkLWc/view?usp=sharing) recorded date: 2015-11-05
 - [Take the Test](http://goo.gl/forms/5Vrf3CE0iC)
-## Upcoming Topics
-Please submit a merge request for suggestions.
-- HA vs. Scalability
-- Groups, Projects, Repositories
-- JIRA and Jenkins integrations in GitLab
-## Resources
-- [GitLab Introduction to Terminology](https://about.gitlab.com/2015/05/18/simple-words-for-a-gitlab-newbie/)
-- [Create a GitLab Account](https://courses.platzi.com/classes/git-gitlab/concepto/first-steps/create-an-account-on-gitlab/material/)
-- [Create and Add your SHH key to GitLab](https://www.youtube.com/watch?v=54mxyLo3Mqk)
-- [Creating a new project in GitLab](https://www.youtube.com/watch?v=7p0hrpNaJ14)
-- [Issue and Merge Request](https://www.youtube.com/watch?v=raXvuwet78M)
+#### Creating a GitLab Account
+- [Create a GitLab Account](https://courses.platzi.com/classes/git-gitlab/concepto/first-steps/create-an-account-on-gitlab/material/)
+- Supporting Document
+    * [Demo of GitLab.com](https://www.youtube.com/watch?v=WaiL5DGEMR4)
+#### Add SHH Key to GitLab
+- [Create and Add your SHH key to GitLab](https://www.youtube.com/watch?v=54mxyLo3Mqk)
+#### Creating a Project in GitLab
+- [Creating a new project in GitLab](https://www.youtube.com/watch?v=7p0hrpNaJ14)
+- Supporting Document
+    * [Demo of GitLab.com](https://www.youtube.com/watch?v=WaiL5DGEMR4)
+#### Issues and Merge Requests
+- [Issue and Merge Request](https://www.youtube.com/watch?v=raXvuwet78M)
+- Supporting Document
+    * [Demo of GitLab.com](https://www.youtube.com/watch?v=WaiL5DGEMR4)
+    
+#### GitLab Wiki
+#### GitLab Activity Log
+#### Branching and Forking
+
+#### GitLab Omnibus
 - [What is GitLab OmniBus?](https://www.youtube.com/watch?v=XTmpKudd-Oo)
 - [How to install GitLab with Omnibus](https://www.youtube.com/watch?v=Q69YaOjqNhg)
-- [Managing permissions within EE](https://www.youtube.com/watch?v=DjUoIrkiNuM)
+- Suport Documents
+    * [Configuring an external PostgreSQL database](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#using-a-non-packaged-postgresql-database-management-server)
+    * [Configuring an external MySQL database](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#using-a-mysql-database-management-server-enterprise-edition-only)
+
+#### GitLab Flow
 - [GitLab Flow](https://about.gitlab.com/2014/09/29/gitlab-flow/)
 - [GitLab Flow vs. Forking in GitLab](https://www.youtube.com/watch?v=UGotqAUACZA)
+
+#### Managing LDAP, Active Directory
 - [Managing LDAP, Active Directory introduction with GitLab](https://www.youtube.com/watch?v=HPMjM-14qa8)
+
+#### Managing Permission
+- [Managing permissions within EE](https://www.youtube.com/watch?v=DjUoIrkiNuM)
+
+#### Continuous Integration and Runners
+- [GitLab CI](https://about.gitlab.com/gitlab-ci/)
+- CI Tools we Integrate with
+    * [Jenkins](http://doc.gitlab.com/ee/integration/jenkins.html)
+    * [Bamboo](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/project_services/bamboo.md)
+
+#### GitLab LFS 
+
+#### GitLab Mirroring
+
+#### GitLab Integrations
+- [Jira](http://doc.gitlab.com/ee/integration/jira.html)
+- Atlassian Crowd
+- [Jenkins](http://doc.gitlab.com/ee/integration/jenkins.html)
+- [Bamboo](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/project_services/bamboo.md)
+- [Slack](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/slack.md)
+
+#### Migrating to GitLab
+- From SVN
+- From GitHub Enterprise
+- From BitBuket
+- From Perforce
+
+#### GitLab Markdowns
+- [Markdowns](http://doc.gitlab.com/ce/markdown/markdown.html)
+
+## Upcoming Topics
+
+Please submit a merge request for suggestions.
+
+- HA vs. Scalability
+- Groups, Projects, Repositories
+- JIRA and Jenkins integrations in GitLab
+
+## Learning Resources
+
 - [GitLab documentation](http://doc.gitlab.com/)
 - [Innersourcing article](https://about.gitlab.com/2014/09/05/innersourcing-using-the-open-source-workflow-to-improve-collaboration-within-an-organization/)
 - [Platzi training course](https://courses.platzi.com/courses/git-gitlab/)
-- [GitLab flow](http://doc.gitlab.com/ee/workflow/gitlab_flow.html)
 - [Sales Onboarding materials](https://about.gitlab.com/handbook/sales-onboarding/)
 - [GitLab Direction](https://about.gitlab.com/direction/)
 - [GitLab compared to other tools](https://about.gitlab.com/comparison/)