Merge branch 'master' of gitlab.com:gitlab-com/www-gitlab-com into release-8-6

.gitattributes

 * text=auto
+*.md text eol=lf

Rakefile

@@ -419,15 +419,15 @@ end
 BUILD_DIR = 'public/'
 DEPLOY_LOCATION = 'deploy@blue-moon.gitlap.com:public/'
 DEPLOY_BRANCH = 'master'
-PDFS = FileList['source/terms/print/*.html'].pathmap('%{^source,public}X.pdf')
-PDFS += %w{public/high-availability/gitlab-ha.pdf public/features/gitlab-features.pdf}
+PDFS = FileList['source/terms/print/*.html'].pathmap('%{^source,public}X.pdf') +
+  %w{public/high-availability/gitlab-ha.pdf public/features/gitlab-features.pdf}
 task :clean do
   rm_rf BUILD_DIR
 end
 desc "Build website in #{BUILD_DIR}"
-task :build => [:clean, :release_list, :generate, :pdfs]
+task :build => [:clean, :release_list, :direction_issues, :generate, :pdfs]
 rule %r{^public/.*\.pdf} => [->(f) { f.pathmap('%X.html') }] do |pdf|
   # Rewrite the generated HTML a bit, fix relative image links for pandoc

generate_direction_issues.rb

 require 'httparty'
-PRIVATE_TOKEN = ENV["private_gl_token"]
+PRIVATE_TOKEN = ENV["PRIVATE_TOKEN"]
 class GitLabInstance
   def initialize(endpoint, private_token, name)
@@ -9,9 +9,9 @@ class GitLabInstance
     @name = name
   end
-  def call(path)
-    url = @endpoint + path + "?private_token=#{@private_token}"
-    data = HTTParty.get(url)
+  def call(path, params = "")
+    url = @endpoint + path + params
+    HTTParty.get(url, headers: { "PRIVATE-TOKEN" => PRIVATE_TOKEN })
   end
   def name
@@ -40,12 +40,8 @@ class GitLabProject
      @instance.call("/projects/#{@id}/milestones/#{milestone_id}")
    end
-   def milestone_issues(milestone_id)
-     @instance.call("/projects/#{@id}/milestones/#{milestone_id}/issues")
-   end
-
-   def milestone_direction_issues
-     @instance.call("/projects/#{@id}/milestones/#{milestone_id}/issues?labels=direction&state=opened")
+   def milestone_direction_issues(milestone_id)
+     @instance.call("/projects/#{@id}/issues", "?milestone=#{milestone_id}&labels=direction")
    end
    def name
@@ -67,28 +63,22 @@ end
 desc 'Generate Direction Page Issue List'
 task :direction_issues do
-  puts 'Generating direction page..'
+  print 'Generating direction page'
   com = GitLabInstance.new('https://gitlab.com', PRIVATE_TOKEN, 'GitLab.com')
-
   ce = GitLabProject.new('gitlab-org%2Fgitlab-ce',com)
   ee = GitLabProject.new('gitlab-org%2Fgitlab-ee',com)
-
-  ar = [ce,ee]
-
+  edition = [ce,ee]
   output = ''
-  ar.each do |project|
-
+  edition.each do |project|
     milestones = project.milestones
-
     output << "## #{project.name}\n\n"
     milestones.each do |ms|
       if ms["due_date"] && Date.parse(ms["due_date"]) > Date.today
-        issues = project.milestone_issues(ms["id"])
-
+        issues = project.milestone_direction_issues(ms["title"])
         output << "### [#{ms["title"]}](#{project.web_url}/milestones/#{ms["iid"]}) \n\n"
         issues.each do |issue|
@@ -102,7 +92,7 @@ task :direction_issues do
     end
   end
-  file_path = "source/direction2/index.md"
+  file_path = "source/direction/index.md"
   original_file = File.read(file_path)
   new_contents = original_file.gsub(/<!-- direction_issues -->/, output)

source/_data/features.yml

@@ -53,6 +53,11 @@
     link: http://doc.gitlab.com/ee/workflow/ff_merge.html
   - description: Git hooks (commit message must mention an issue, no tag deletion, etc.)
     link: http://doc.gitlab.com/ee/git_hooks/git_hooks.html
+  - description: Webhooks at Project Level
+    link: http://doc.gitlab.com/ee/web_hooks/web_hooks.html
+    in_ce: true
+  - description: Webhooks at Group Level  
+    link: http://doc.gitlab.com/ee/web_hooks/web_hooks.html
   - description: Lock project membership to the members of a group
     link: http://doc.gitlab.com/ee/workflow/groups.html
   - description: Approve Merge Requests
@@ -76,6 +81,7 @@
   features:
   - description: Branded Login Page
     link: http://doc.gitlab.com/ee/customization/branded_login_page.html
+    in_ce: true
   - description: An admin can email all users of a project, a group or the entire server
     email: http://doc.gitlab.com/ee/tools/email.html
   - description: Omnibus package supports log forwarding
@@ -87,6 +93,8 @@
     link: http://doc.gitlab.com/ce/workflow/importing/import_projects_from_github.html
   - description: Project importing from GitLab.com to your private GitLab instance
     link: http://doc.gitlab.com/ce/workflow/importing/import_projects_from_gitlab_com.html
+  - description: Super-powered search using Elasticsearch
+    link: http://doc.gitlab.com/ee/integration/elasticsearch.html#sts=Elasticsearch_integration
 - title: Deeper integration with your tool stack
   features:
@@ -106,3 +114,24 @@
     in_ce: true
   - description: Omnibus package supports configuring an external MySQL database
     link: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#using-a-mysql-database-management-server-enterprise-edition-only
+
+- title: Continuous Integration
+  features:
+  - description: Continuous integration shipped along and fully integrated in the GitLab interface
+    in_ce: true
+    link: http://doc.gitlab.com/ce/ci/
+  - description: Configure CI builds using a versioned, flexible build script
+    in_ce: true
+    link: http://doc.gitlab.com/ce/ci/yaml/README.html
+  - description: Power your CI with Docker
+    in_ce: true
+    link: http://doc.gitlab.com/ce/ci/docker/using_docker_images.html
+  - description: Artifacts as output. Stored in GitLab and explorable
+    in_ce: true
+    link: http://doc.gitlab.com/ce/ci/build_artifacts/README.html
+  - description: Run your builds on any machine, architecture, infinitely scalable
+    in_ce: true
+    link: http://doc.gitlab.com/ce/ci/runners/README.html
+  - description: Trigger builds easily, allowing for extensive customization and integration with your existing tools
+    in_ce: true
+    link: http://doc.gitlab.com/ce/ci/triggers/README.html

source/_data/pets.yml

+- name: Asti
+  picture: asti.jpg
+  human: dzaporozhets
+  story: Woof! And smile.
+- name: Suzy
+  picture: suzy.jpg
+  human: sytse
+  story: Curious kitty.
+- name: Maçã
+  picture: maca.jpg
+  human: job
+  story: |
+          Maca loves to play with plastic bottles and sleep on any surface
+          near her owners.
+- name: Sadie
+  picture: sadie.jpg
+  human: haydn
+  story: |
+         Lick Bull Terrier. So cute. Keeps <a href="http://everybodylovessadie.blogspot.com/">her own blog</a>.
+- name: Ramona
+  picture: ramona.jpg
+  human: patricio
+  story: Loves the beach.
+- name: Lola
+  picture: lola.jpg
+  human: ashley
+  story: Super hip and fashionable. Lola likes snacks, naps and snacks.
+- name: Humpf
+  picture: humpf.jpg
+  story: Well-trained black lab with a love for carrots and naps.
+- name: Winston and Benny
+  picture: winston_benny.jpg
+  human: drew
+  story: A three-legged Pit Bull and a Cocker Spaniel. Odd but loveable brothers.
+- name: Mouse
+  picture: mouse.jpg
+  human: yorick
+  story: |
+         Laser pointer enthusiast, loves clean sheets. Sits where he fits,
+         preferably on top of his human.
+- name: Malu
+  picture: malu.jpg
+  human: douglas
+  story: Feed me and I’ll love u forever.
+- name: Maggie
+  picture: maggie.jpg
+  human: jschatz
+  story: Lagotto with the heart of a lion, and a lifetime ban from the zoo.
+- name: Pacho
+  picture: pacho.jpg
+  human: pablo
+  story: Indoor catch ball enthusiast. Preferably XL sized balls.
+- name: Zayats!
+  picture: zayats.jpg
+  human: ivan
+  story: Surprisingly smart and constantly hungry. Takes care of your wires. Exclamation mark is necessary.
+- name: Lincoln and Mona
+  picture: lincolnmona.png
+  human: emily
+  story: Silly, doodle duo who dream of being in the next muppet movie.
+- name: You?
+  picture: ../logo-extra-whitespace.png
+  story:  |
+  
+          Want to see your name and picture here? Ask your owner/servant to
+          check out our latest
+          <a href="http://about.gitlab.com/jobs/">job openings</a>!

source/_data/team.yml

@@ -186,7 +186,6 @@
   gitlab: rspeicher
   maintains:  |
               <li>Merge request <a href="http://www.urbandictionary.com/define.php?term=endboss&defid=5331178">endboss</a></li>
-              <li>Maintainer of <a href="https://gitlab.com/gitlab-com/www-gitlab-com">www-gitlab-com</a></li>
               <li>Maintainer of <a href="https://gitlab.com/gitlab-com/marketo-tools">Marketo tools</a></li>
               <li>Trained <a href="https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/monthly.md#release-manager">Release Manager</a></li>
   story:  |
@@ -208,8 +207,8 @@
           In his spare time, Ernst likes to think that he flies gliders, travels, and goes scuba diving, but actually he's having a great time playing with his kids and golden retrievers.
 - name: Emily Kyle
-  role: <a href="https://about.gitlab.com/jobs/sales-administrator/">Sales Admin</a>
-  reports_to: CRO
+  role: <a href="https://about.gitlab.com/jobs/field-marketing-manager/">Field Marketing Manager</a>
+  reports_to: CMO
   picture: emilykyle.jpg
   twitter: emilylucie
   gitlab: emilykyle
@@ -266,7 +265,7 @@
           Chad the opportunity to visit Tahoe, Napa Valley and San Francisco often.
 - name: Jeroen Nijhof
-  role: Senior <a href="https://about.gitlab.com/jobs/devops-engineer/">DevOps Engineer</a>
+  role: Senior <a href="https://about.gitlab.com/jobs/production-engineer/">Production Engineer</a>
   reports_to: CEO
   picture: jnijhof.jpg
   twitter: jeroen_nijhof
@@ -327,15 +326,6 @@
   story:  |
           Before joining GitLab, Kelvin was a developer and system's engineer for a Kenyan Financial Services platform, Abacus. He is passionate about playing chess, video games, watching sci-fi movies, reading novels and watching soccer.
-- name: Liza Beiliaieva
-  role: <a href="https://about.gitlab.com/jobs/ux-designer/">UX Designer</a>
-  reports_to: CTO
-  picture: picture_liza.jpg
-  twitter: creamzzzy
-  gitlab: creamzy
-  story: |
-         Liza comes from a maths background, bringing her passion for order and consistency to the design world. With more than seven years of experience in both corporate environments and the startup world she is really excited about delivering meaningful and useful experiences to people in need. Through open source software and a vegan lifestyle she hopes to change this world for the better.
-
 - name: Gabriel Mazetto
   role: <a href="https://about.gitlab.com/jobs/developer/">Developer</a>
   reports_to: Development Lead
@@ -468,25 +458,12 @@
   story:  |
           Wilson has worked in many accounting roles at various early to mid-stage startups over the past 20 years.  When not debiting or crediting,  you can find Wilson at a San Francisco Giants game, spending time with his dogs or at the poker table.  Ante up!
-- name: Stephen Breen
-  role: <a href="https://about.gitlab.com/jobs/devops-engineer/">DevOps Engineer</a>
-  reports_to: CEO
-  picture: stevebreen.jpg
-  twitter: ahoybreen
-  gitlab: sbreen
-  maintains: |
-             <li>On-call trainee!</li>
-  story:  |
-          Stephen has over a decade of experience with data center infrastructure including virtualization, storage and application deployment.  He tinkers with micro-controllers and building IoT devices.  Stephen enjoys the outdoors, especially the ski slopes in the Sierra Nevada Mountains.
-
 - name: Ian Wilson
-  role: <a href="https://about.gitlab.com/jobs/devops-engineer/">DevOps Engineer</a>
+  role: <a href="https://about.gitlab.com/jobs/production-engineer/">Production Engineer</a>
   reports_to: CEO
   picture: uid0.jpg
   twitter: uid0
   gitlab: uid0
-  maintains: |
-             <li>On-call trainee!</li>
   story: |
          Ian's just your normal nerd who lives on a farm.  He blows and tinkers with glass in order to build telescopes and make neon art, is a board member and former president of his local hackerspace, and volunteers at a school for hearing impaired children in his spare time.  .
 - name: Tomasz Maczukin
@@ -564,6 +541,8 @@
   picture: james.png
   twitter: jlopezofficial
   gitlab: jameslopez
+  maintains: |
+             <li>Part-time maintainer of <a href="https://github.com/jneen/rouge">rouge</a></li>
   story:  |
           James is an experienced developer coming from the corporate world
           of Vodafone in the UK. He has contributed to the open source
@@ -619,11 +598,13 @@
           Michael has been helping customers choose, deploy, and use software development tools since the 80's at companies like Borland, Symantec, Gupta, and Perforce.  Michael is passionate about building teams and business in the far-flung corners of the world.  When not working, Michael is an award winning wine maker and heavily involved in the local Boy Scouts.
 - name: Pablo Carranza
-  role: Senior <a href="https://about.gitlab.com/jobs/devops-engineer/">DevOps Engineer</a>
+  role: Senior <a href="https://about.gitlab.com/jobs/production-engineer/">Production Engineer</a> and operations lead
   reports_to: CEO
   picture: pablo.jpg
   twitter: psczg
   gitlab: pcarranza
+  maintains:  |
+              <li>On-call hero!</li>
   story:  |
           With over 15 years of industry experience, Pablo comes from scaling Amazon's network as a development lead
           to help scaling GitLab.com. Passionate about programming since the age of 8 and open source after discovering Gentoo.
@@ -675,7 +656,7 @@
   twitter: iamphill
   gitlab: iamphill
   maintains:  |
-                <li>Frontend of <a href="https://gitlab.com/gitlab-com/www-gitlab-com">www-gitlab-com</a></li>
+                <li>Maintainer of <a href="https://gitlab.com/gitlab-com/www-gitlab-com">www-gitlab-com</a></li>
   story:  |
           Phil has a huge passion for programming, with skills ranging anywhere from JavaScript to C++. Having experienced a variety of roles in industry, he realised that front-end development was more his "cup of tea" and has since been focusing on improving his skills in this area. When not geeking out, he loves to spend time with his wife and preparing for the arrival of Baby Hughes... which could be any day now!
@@ -696,3 +677,76 @@
   gitlab: cabargas
   story:  |
           Felipe is a rubyist from Chile trying to get more people into the Git boat. He likes to comunicate tech to non-tech individuals and help local communities reach more people. When AFK, he is desoldering stuff, 3D printing Star Wars models or in the stadium with his father and brother cheering for 'La U'.
+
+- name: A.F
+  role: <a href="https://about.gitlab.com/jobs/developer-advocate/">Developer Advocate</a>
+  reports_to: CMO
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining March 7th
+
+- name: R.C
+  role: <a href="https://about.gitlab.com/jobs/business-development-representative/">Business Development Representative</a>
+  reports_to: Senior Demand Generation Manager
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining March 9th
+
+- name: E.A.
+  role: <a href="https://about.gitlab.com/jobs/frontend-engineer/">Frontend Engineer</a>
+  reports_to: CTO
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining March 14th
+
+- name: J.B.
+  role: <a href="https://about.gitlab.com/jobs/strategic-relations-manager/">Strategic Relations Manager</a>
+  reports_to: CEO
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining March 15th
+          
+- name: F.C.
+  role: <a href="https://about.gitlab.com/jobs/developer/">Developer</a>
+  reports_to: Development Lead
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining March 17th   
+          
+- name: D.M.
+  role: <a href="https://about.gitlab.com/jobs/developer/">Developer</a>
+  reports_to: Development Lead
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining March 23rd          
+
+- name: T.A.
+  role: <a href="https://about.gitlab.com/jobs/developer/">Developer</a>
+  reports_to: Development Lead
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining April 11th
+
+- name: M.F.
+  role: <a href="https://about.gitlab.com/jobs/service-engineer/">Service Engineer</a>
+  reports_to: COO
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining May 1st
+

source/_includes/newsletter_signup.html

@@ -17,9 +17,26 @@
     </span>
     <div class="newsletter-form">
+
       <script src="//app-ab13.marketo.com/js/forms2/js/forms2.min.js"></script>
       <form id="mktoForm_1077"></form>
-      <script>MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1077);</script>
+      <script>
+
+
+        MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1077, function(form) {
+          form.onSuccess(function(values, followUpUrl) {
+
+            form.getFormElem().hide();
+            document.getElementById('confirmform').style.visibility = 'visible';
+
+            ga('send', 'pageview');
+            ga('send', 'event', 'form', 'submit', 'newsletter signup');
+            return false;
+          });
+        });
+      </script>
+
+       <div id="confirmform" style="visibility:hidden;"><p>Thanks for subscribing!</p></div>
     </div>
   </div>
 </div>
\ No newline at end of file

source/_includes/other_download_links.html

@@ -6,4 +6,5 @@
   <h5><a href="/aws">GitLab Community Edition AWS AMI (preloaded Omnibus package)</a></h5>
   <h5><a href="/installation/">Alternative installation methods</a></h5>
   <h5><a href="http://doc.gitlab.com/ce/install/requirements.html">Installation requirements</a></h5>
+  <h5><a href="https://about.gitlab.com/features/#compare">Compare GitLab CE vs. EE</a></h5>
 </div>

source/_posts/2012-01-22-gitlabhq-2-1-released.markdown

@@ -19,4 +19,4 @@ comments: false
 <a href="http://blog.gitlabhq.com/wp-content/uploads/2012/01/1328709.png"><img src="http://blog.gitlabhq.com/wp-content/uploads/2012/01/1328709-300x145.png" alt="" title="1328709" width="300" height="145" class="alignleft size-medium wp-image-207" /></a>
-<h2>and deploy keys, web hooks, etc</h2>
+<h2>and deploy keys, webhooks, etc</h2>

source/_posts/2012-11-13-continuous-integration-server-from-gitlab.markdown

@@ -30,7 +30,7 @@ And today we announced another FOSS software for developers. Its GitLab CI.
 **GitLab CI supports only git SCM.**
-**GitLab CI requires present of GitLab instance with web hooks setup to make builds automatically**
+**GitLab CI requires present of GitLab instance with webhooks setup to make builds automatically**
 ### How it works: 
@@ -38,9 +38,9 @@ And today we announced another FOSS software for developers. Its GitLab CI.
 2. Then you clone projects you want to test and setup test environment
 3. Next step is just add projects to GitLab CI via web UI
   ![Screenshot](/images/gitlab_ci_new_project.png)
-4. Add just copy HTTP POST url provided by GitLab CI to your GitLab web hooks
+4. Add just copy HTTP POST url provided by GitLab CI to your GitLab webhooks
   ![Screenshot](/images/gitlab_ci_project.png)
-5. When you push code to GitLab web hook will trigger CI to make a build
+5. When you push code to GitLab webhook will trigger CI to make a build
 [Source Code](https://github.com/gitlabhq/gitlab-ci)

source/_posts/2013-02-21-gitlab-v4-dot-2-has-been-released.markdown

@@ -32,7 +32,7 @@ We improved performance, fixed some bugs, added teams, users pages and more
 2. Performance: 
     * Async gitolite calls
-    * Process web hooks async
+    * Process webhooks async
 3. Permissions:

source/_posts/2013-10-17-gitlab-ce-6-dot-2-released.markdown

@@ -84,7 +84,7 @@ Misc:
   - Group owner or admin can remove other group owners
   - Make default user theme configurable (Izaak Alpert)
   - Update logic for validates_merge_request for tree of MR (Andrew Kumanyaev)
-  - Rake tasks for web hooks management (Jonhnny Weslley)
+  - Rake tasks for webhooks management (Jonhnny Weslley)
   - Fixed relative links in markdown
 - - -

source/_posts/2013-12-19-gitlab-ce-6-dot-4-released.markdown

@@ -44,10 +44,10 @@ It is hidden from the dashboard and it does not show up in searches.
 Archived projects you have access to will still be listed on your profile page (gitlab.example.com/u/my_user).
-### Project web hooks
-Project web hooks were extended with new types of events.
-Web hooks can now also be triggered when an issue is created or a merge requst is closed.
+### Project webhooks
+Project webhooks were extended with new types of events.
+Webhooks can now also be triggered when an issue is created or a merge requst is closed.
 [![screenshot](/images/6_4/hook.png)](/images/6_4/hook.png)

source/_posts/2014-05-06-gitlab-ci-5-dot-0-released.markdown

@@ -43,11 +43,11 @@ This way we can ensure that killing the script also kills all its child processe
 __We would like to thank Corin Langosch for contributing these improvements.__
-## Web hooks
+## Webhooks
 In order to build some services based on GitLab CI you may need hooks that send data when the build finishes.
 GitLab already has such hooks, but up until now, GitLab CI did not.
-With GitLab CI version 5, we have added web hook functionality. We thank Võ Anh Duy for help with this feature.
+With GitLab CI version 5, we have added webhook functionality. We thank Võ Anh Duy for help with this feature.
 [![screenshot](/images/ci_5/hooks.png)](/images/ci_5/hooks.png)

source/_posts/2014-09-29-gitlab-flow.markdown

@@ -76,7 +76,7 @@ With GitLab flow we offer additional guidance for these questions.
 ![Master branch and production branch with arrow that indicate deployments](/images/git_flow/production_branch.png)
 GitHub flow does assume you are able to deploy to production every time you merge a feature branch.
-This is possible for SaaS applications but are many cases where this is not possible.
+This is possible for SaaS applications but there are many cases where this is not possible.
 One would be a situation where you are not in control of the exact release moment, for example an iOS application that needs to pass AppStore validation.
 Another example is when you have deployment windows (workdays from 10am to 4pm when the operations team is at full capacity) but you also merge code at other times.
 In these cases you can make a production branch that reflects the deployed code.

source/_posts/2015-01-05-writing-the-gitlab-book-part-1.markdown

@@ -45,7 +45,7 @@ with the following outline:
 3. Managing users, groups and permissions
 4. Issue tracker and Wiki
 5. Maintaining your GitLab instance
-6. Web hooks, external services and the API
+6. Webhooks, external services and the API
 7. Using LDAP and omniauth providers
 8. GitLab CI
 9. Appendix

source/_posts/2015-03-22-gitlab-7-9-released.markdown

@@ -65,8 +65,8 @@ Blocking user will not remove users from their projects and groups. GitLab 7.9 w
 ## Group level webhooks (EE only feature)
-In earlier versions of GitLab you were able to add a web hook for a project.
-Share the same web hooks between multiple projects - just setup it once in group.
+In earlier versions of GitLab you were able to add a webhook for a project.
+Share the same webhooks between multiple projects - just setup it once in group.
 [![screenshot](/images/7_9/group-hooks.png)](/images/7_9/group-hooks.png)

source/_posts/2015-04-15-bitbucket-vs-gitlab-com.markdown

@@ -98,7 +98,7 @@ that you can use by simply selecting them.
 ## Comes with a CI!
 With every GitLab installation, you get our continuous integration tool
-GitLab CI! GitLab.com users can use it for free on [ci.gitlab.com](https://ci.gitlab.com/). It integrates fully with GitLab, so you can easily see the
+GitLab CI! GitLab.com users [can use it for free](http://doc.gitlab.com/ce/ci/quick_start/README.html). It integrates fully with GitLab, so you can easily see the
 build status of any branch, commit or merge request and run your
 deployments automatically after!

source/_posts/2015-06-22-gitlab-7-12-released.markdown

@@ -35,7 +35,7 @@ See our [documentation on how to setup SAML integration](http://doc.gitlab.com/c
 ## Web Hook for Comments
-There is a new web hook available that will trigger on all comments.
+There is a new webhook available that will trigger on all comments.
 You could use this to add additional automations and integrations to GitLab.
 For instance when someone comments on a merge request, you can have it
 trigger internal systems or, depending on the comment contents,

source/_posts/2015-09-22-gitlab-8-0-released.markdown

@@ -161,16 +161,16 @@ in adding PostgreSQL compatibility.
 How quickly these are solved will determine if GitLab 8.1 will ship
 with Rocket Chat or whether it will be delayed.
-## SSL Verification for Web Hooks
-We've now enabled SSL verification for web hooks by default.
-This makes web hooks safer to use and helps mitigate man-in-the-middle attacks.
-You can turn this off in the web hook settings of a project.
-![Configure SSL verification of Web Hooks](/images/8_0/webhooks.png)
-* [View the documentation for Web Hooks](http://doc.gitlab.com/ce/web_hooks/web_hooks.html)
+## SSL Verification for Webhooks
+We've now enabled SSL verification for webhooks by default.
+This makes webhooks safer to use and helps mitigate man-in-the-middle attacks.
+You can turn this off in the webhook settings of a project.
+![Configure SSL verification of Webhooks](/images/8_0/webhooks.png)
+* [View the documentation for Webhooks](http://doc.gitlab.com/ce/web_hooks/web_hooks.html)
 ## Public User Profile and Group Pages
@@ -289,7 +289,7 @@ One of the biggest improvements of GitLab 8.0 is integrated GitLab CI.
 Doing that required large amount of changes, including rebuild of the GitLab CI Service in GitLab.
 With all these changes we removed the GitLabCiService. This change broke the Jenkins [gitlab-plugin](https://github.com/jenkinsci/gitlab-plugin) that allowed Jenkins to act as an external GitLab CI in front of GitLab.
-You can still use [mentioned plugin](https://github.com/jenkinsci/gitlab-plugin) with GitLab. For all Web Hooks that you added you need to enable not only *Merge Request Events*, but also *Push and Tag Events*. By doing that GitLab will properly notify Jenkins when you do **git push**. This doesn't resolve missing build status for Jenkins builds in GitLab interface. We are working hard to bring the Commit Status API that will allow any external service to post the build status back to GitLab. When this gets implemented by the maintainer of this plugin it will make the integration much better then it was in versions prior to 8.0.
+You can still use [mentioned plugin](https://github.com/jenkinsci/gitlab-plugin) with GitLab. For all Webhooks that you added you need to enable not only *Merge Request Events*, but also *Push and Tag Events*. By doing that GitLab will properly notify Jenkins when you do **git push**. This doesn't resolve missing build status for Jenkins builds in GitLab interface. We are working hard to bring the Commit Status API that will allow any external service to post the build status back to GitLab. When this gets implemented by the maintainer of this plugin it will make the integration much better then it was in versions prior to 8.0.
 - - -