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

Conflicts: README.md

Merge branch 'master' of gitlab.com:gitlab-com/www-gitlab-com into guidelines
a0cef16f · Sabba Petri · f5b43333 · fec915bc · a0cef16f · a0cef16f
Commit a0cef16f authored 10 years ago by Sabba Petri
--- a/README.md
+++ b/README.md
@@ -80,6 +80,11 @@ Add the following to the top of a blog post (between the --- markers) and it wil
  
 # Image Guidelines
 When adding images to the site, please avoid using largely sized images, as they drastically decrease load on the server and make the experience poor for the user. Also make sure to compress the images as much as possible (use online resource, Photoshop, however you'd like)
+Photos can be found at unsplash.com, and compressed using sites like tinypng.com
+
+You can link to the authors twitter account with:
+
+    author_twitter: sytses
  
 # Other documentation
  

--- a/Rakefile
+++ b/Rakefile
@@ -114,10 +114,12 @@ task :new_post, :title do |t, args|
    post.puts "---"
    post.puts "layout: post"
    post.puts "title: \"#{title.gsub(/&/,'&amp;')}\""
-    post.puts "date: #{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}"
+    post.puts "date: #{Time.now.strftime('%Y-%m-%d')}"
    post.puts "comments: true"
-    post.puts "categories: "
+    post.puts "author: FIRST LAST"
+    post.puts "author_twitter: HANDLE_WITHOUT_@"
    post.puts "---"
+    post.puts "image_title: '/images/unspash/FILENAME.jpg'"
  end
 end
  

--- a/source/_includes/consultancy_terms.html
+++ b/source/_includes/consultancy_terms.html
@@ -116,5 +116,7 @@
  </li>
 </ol>
 <p>
-  <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Sharealike</a> license
+  The text of these terms is licensed under the
+  <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Sharealike</a>
+  license.
 </p>
--- a/source/_includes/default_head.html
+++ b/source/_includes/default_head.html
@@ -2,7 +2,7 @@
 <html>
 <head>
  <meta charset="utf-8">
-  <title>GitLab | {{ page.title }}</title>
+  <title>{{ page.title }} | GitLab</title>
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta name="description" content="">
  <link rel="alternate" type="application/atom+xml" title="Blog" href="/atom.xml" />

--- a/source/_includes/gitlab_com_terms.html
+++ b/source/_includes/gitlab_com_terms.html
@@ -174,7 +174,11 @@
  </li>
 </ol>
 <p>
-  <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Sharealike</a> license, parts taken from <a href="http://www.wordpress.com/">WordPress.com</a> ToS
+  The text of these terms is licensed under the
+  <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Sharealike</a>
+  license, parts are courtesy of the
+  <a href="http://www.wordpress.com/">WordPress.com</a>
+  Terms of Service.
 </p>
  
  
--- a/source/_includes/newsletter_signup.html
+++ b/source/_includes/newsletter_signup.html
@@ -4,7 +4,9 @@
    on Twitter.
  
    <a href="/atom.xml" class="rss-btn">
-      <button class="btn btn-sm btn-default">RSS</button>
+      <button class="btn btn-sm btn-default" data-toggle="tooltip" data-placement="right" title="RSS">
+        <i class="fa fa-rss"></i>
+      </button>
    </a>
  
  </div>

--- a/source/_includes/subscription_terms.html
+++ b/source/_includes/subscription_terms.html
@@ -207,5 +207,7 @@
 </ol>
  
 <p>
-  <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Sharealike</a> license
+  The text of these terms is licensed under the
+  <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Sharealike</a>
+  license.
 </p>
--- a/source/_posts/2015-03-03-gitlab-acquires-gitorious.markdown
+++ b/source/_posts/2015-03-03-gitlab-acquires-gitorious.markdown
+---
+layout: post
+title: "GitLab acquires Gitorious to bolster its on premises code collaboration platform"
+date: 2015-03-03
+comments: true
+author: Sytse Sijbrandij
+author_twitter: sytses
+image_title: '/images/unsplash/water.jpg'
+---
+
+As [reported by the Next Web](http://thenextweb.com/insider/2015/03/03/gitlab-acquires-rival-gitorious-will-shut-june-1/) GitLab and Gitorious announce today they are joining forces in an effort to strengthen the development of GitLab’s open source Git management application and provide Gitorious customers with an enhanced user experience.
+
+Since 2008, Gitorious has been one of the leading providers for open source hosting and on-premise enterprise Git management around the globe. Gitorious was the first widely used open source Git management application.
+
+“We believe that, in the long term, coming together under one umbrella with a common goal will benefit everyone, so we are getting that process started today” says GitLab CEO, Sytse Sijbrandij.
+
+<!-- more -->
+
+GitLab is a simple upgrade path for existing Gitorious users. GitLab offers Git repository management, code reviews, issue tracking, activity feeds, wikis and continuous integration.
+
+Rolf Bjaanes, Gitorious CEO, gives some background on the reasons for the acquisition: “At Gitorious we saw more and more organizations adopting GitLab. Due to decreased income from on-premises customers, running the free Gitorious.org was no longer sustainable. GitLab was solving the same problem that we were, but was solving it better.”
+
+“This acquisition will accelerate the growth of GitLab. With more than 100,000 organizations using it, it is already the most used on-premise solution for Git repository management, and bringing Gitorious into the fold will significantly increase that footprint.” says Sytse Sijbrandij, GitLab CEO.
+
+Starting today, Gitorious.org users can import their existing projects into GitLab.com by clicking the “Import projects from Gitorious.org” link when creating a new project. Gitorious.org will stay online until the end of May 2015 to give people time to migrate their repositories. Existing users of Gitorious on-premises can contact sales@gitlab.com for more information.
+
+We are both confident that the communities around GitLab and Gitorious will see the advantage of combining our strengths to make the best open source software to collaborate on code.
+
+---
--- a/source/_posts/2015-03-04-gitlab-7-8-2-released.markdown
+++ b/source/_posts/2015-03-04-gitlab-7-8-2-released.markdown
+---
+layout: post
+title: "GitLab 7.8.2 Released"
+date: 2015-03-04
+comments: true
+categories:
+author: Marin Jankovski
+---
+
+Today we release GitLab 7.8.2 CE, EE and GitLab CI 7.8.2.
+
+
+GitLab 7.8.2 CE fixes:
+
+- Fix service migration issue when upgrading from versions prior to 7.3
+- Fix setting of the default use project limit via admin UI
+- Fix display of already imported projects for GitLab and Gitorious importers
+- Fix response of push to repository to return "Not found" if user doesn't have access
+- Fix check if user is allowed to view the file attachment
+- Fix import check for case sensitive namespaces
+
+In addition to the fixes in 7.8.2 CE, Enterprise Edition 7.8.2 contains the following fixes:
+
+- Check if LDAP admin group exists before querying for user membership
+- Remove duplicate settings link in admin section
+
+GitLab 7.8.2 CI fixes:
+
+- Fix email notifications for build failures
+
+<!-- more -->
+
+## Upgrade barometer
+
+This upgrade doesn't contain database migrations when upgrading from 7.8.1. so it can be done without downtime.
+
+## Upgrading
+
+Omnibus-gitlab packages for GitLab 7.8.2 are [now available](https://about.gitlab.com/downloads/).
+
+To upgrade a GitLab installation from source please use the
+[upgrader](http://doc.gitlab.com/ce/update/upgrader.html) or the [patch update
+guide](http://doc.gitlab.com/ce/update/patch_versions.html).
+
+To upgrade a GitLab CI installation from source, please use the [upgrade guide](https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/update/patch_versions.md).
+
+## Enterprise Edition
+
+Omnibus packages for GitLab Enterprise Edition 7.8.2 are available for subscribers [here](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md). For installations from source, use [this guide](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/update/patch_versions.md).
+
+Interested in GitLab Enterprise Edition?
+For an overview of feature exclusive to GitLab Enterprise Edition please have a look at the [features exclusive to GitLab EE](http://about.gitlab.com/features/#enterprise).
+
+Access to GitLab Enterprise Edition is included with a [subscription](http://www.gitlab.com/subscription/).
+No time to upgrade GitLab yourself?
+A subscription also entitles to our upgrade and installation services.
--- a/source/_posts/2015-03-04-gitlab-is-part-of-the-y-combinator-family.markdown
+++ b/source/_posts/2015-03-04-gitlab-is-part-of-the-y-combinator-family.markdown
+---
+layout: post
+title: "GitLab is part of the Y Combinator family"
+date: 2015-03-04
+comments: true
+author: Sytse Sijbrandij
+author_twitter: sytses
+image_title: '/images/unsplash/yc.jpg'
+---
+
+As [reported by Techcrunch](http://techcrunch.com/2015/03/03/the-great-git-debate/) we’re part of Y Combinator’s winter 2015 batch!
+
+Y Combinator, a Silicon Valley based seed fund, provides mentorship, advice and connections to a meticulously selected group of startups in two batches each year. Previous startups that went to the program include Dropbox, AirBnB, Stripe and Reddit. Y Combinator has also funded some of the best tools for developer community - including Heroku, CoreOS and Docker. Being selected by Y Combinator is a fantastic opportunity to learn from successful startup founders and leverage the experience of Y Combinators’ extensive network.
+
+<!-- more -->
+
+At first glance, it might not seem obvious for our company to join Y Combinator since we already have 10 employees and hundreds of paying clients. The reason for joining was learning more about how to grow as a company. We were always really focussed on GitLab and of course we never want to lose that. But we want to avoid as many mistakes made by fast growing companies and to learn from the Y Combinator partners that have seen hundreds of organizations growing fast. There are regular events that feature experts in all facets of building a company, from user retention to enterprise sales. And it is great to hear stories from other startups,what they have overcame and how relentlessly resourceful they have been.
+
+Our team has moved to Mountain View for the program to both focus and learn from the broader Silicon Valley ecosystem. Having the whole team in together Silicon Valley has been a great opportunity to bond with each other and work with some of our larger customers. Going forward we’ll continue to have most of our people working remotely but we’re also hiring for an inside-sales and a director of sales position in San Francisco.
+
+We think that what we are learning at Y Combinator will help us deliver a better product and service to all GitLab users. Our commitment to shipping a great open source product has never been greater. Feel free to ask any questions you might have in the comments below.
--- a/source/applications/index.html
+++ b/source/applications/index.html
@@ -196,6 +196,15 @@ extra_css:
      </div>
    </div>
  
+    <div class="row">
+      <div class="col-md-4">
+        <h4>Leanlabs.io Kanban board</h4>
+        <p>Simple kanban board for Gitlab issues</p>
+        <a href="http://kanban.leanlabs.io">kanban.leanlabs.io</a>
+      </div>
+    </div>
+
+
    <hr />
  
    <h2 id="continuous-integration">Continuous Integration</h2>

--- a/source/contributing/index.html
+++ b/source/contributing/index.html
@@ -20,7 +20,7 @@ extra_css:
    <div class="row">
      <div class="col-sm-6">
        <a href="https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md">
-          <div class="link-box">
+          <div class="link-box single">
            <h4>Contributing Guidelines</h4>
            If you want to contribute to GitLab, make sure to read and follow the contributing guidelines.
          </div>
@@ -36,7 +36,8 @@ extra_css:
          </div>
        </a>
      </div>
-
+    </div>
+      <div class="row">
      <div class="col-sm-6">
        <a href="http://feedback.gitlab.com/">
          <div class="link-box">
@@ -48,12 +49,25 @@ extra_css:
  
      <div class="col-sm-6">
        <a href="/development/">
-          <div class="link-box">
+          <div class="link-box single">
            <h4>Sponsor the development of new features</h4>
            If you want us to implement a certain feature, you can sponsor us to do so.
          </div>
        </a>
      </div>
    </div>
+
+    <div class="row">
+      <div class="col-sm-6">
+        <a href="http://feedback.gitlab.com/forums/176466-general/status/796455">
+          <div class="link-box">
+            <h4>Accepting Merge/Pull Requests</h4>
+            You can find out if we are accepting merge requests for certain suggestion features here.
+          </div>
+        </a>
+      </div>
+    </div>
+
+    </div>
  </div>
 </div>
--- a/source/downloads/archives/index.html
+++ b/source/downloads/archives/index.html
@@ -25,6 +25,42 @@ title: GitLab CE Download Archives
                </thead>
                <tbody>
  
+                  <!-- GitLab / CI 7.8.2  -->
+                  <tr>
+                    <td><img src="/images/ubuntu.png"></td>
+                    <td>Ubuntu 12.04 LTS 64bit</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/ubuntu-12.04/gitlab_7.8.2-omnibus.1-1_amd64.deb">gitlab_7.8.2-omnibus.1-1_amd64.deb</a></td>
+                    <td>9a91f9344b9cce376f6e620773d7607f9c42f93ac9b4ee4cbebfb3f2ce736cfc</td>
+                  </tr>
+
+                  <tr>
+                    <td><img src="/images/ubuntu.png"></td>
+                    <td>Ubuntu 14.04 LTS 64bit</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.2-omnibus.1-1_amd64.deb">gitlab_7.8.2-omnibus.1-1_amd64.deb</a></td>
+                    <td>9e052536e2a76e61bbd16b4bff771cff560ab2ffe966c90bd85510d1849f9996</td>
+                  </tr>
+
+                  <tr>
+                    <td><img src="/images/debian.png"></td>
+                    <td>Debian 7 (Wheezy) 64bit</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/debian-7.8/gitlab_7.8.2-omnibus.1-1_amd64.deb">gitlab_7.8.2-omnibus.1-1_amd64.deb</a></td>
+                    <td>4eb7c4b1b4e22580488698b48748524f2f0dbba1873f52e3e606a838f48f6132</td>
+                  </tr>
+
+                  <tr>
+                    <td><img src="/images/centos.png"></td>
+                    <td>CentOS 6.6 64bit (compatible with all Enterprise Linux 6.x distributions)</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/centos-6.6/gitlab-7.8.2_omnibus.1-1.el6.x86_64.rpm">gitlab-7.8.2_omnibus.1-1.el6.x86_64.rpm</a></td>
+                    <td>dbf343fa18d4c64894996e0d906289ecb242f92cfe4c448ab8bdc87f84d4e4d3</td>
+                  </tr>
+
+                  <tr>
+                    <td><img src="/images/centos.png"></td>
+                    <td>CentOS 7.0 64bit (compatible with all Enterprise Linux 7.x distributions)</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/centos-7.0.1406/gitlab-7.8.2_omnibus.1-1.el7.x86_64.rpm">gitlab-7.8.2_omnibus.1-1.el7.x86_64.rpm</a></td>
+                    <td>3fe237777fd1ea619b382ecbefc51244088b3b9606361e5735d25506800c4111</td>
+                  </tr>
+
                  <!-- GitLab / CI 7.8.1  -->
                  <tr>
                    <td><img src="/images/ubuntu.png"></td>
@@ -1285,4 +1321,4 @@ title: GitLab CE Download Archives
      </div>
    </div>
  </div>
-</div>
\ No newline at end of file
+</div>
--- a/source/downloads/index.html
+++ b/source/downloads/index.html
@@ -8,34 +8,34 @@ extra_js:
 platforms:
 - name: ubuntu1204
  long_name: Ubuntu 12.04
-  download_command: wget https://downloads-packages.s3.amazonaws.com/ubuntu-12.04/gitlab_7.8.1-omnibus-1_amd64.deb
+  download_command: wget https://downloads-packages.s3.amazonaws.com/ubuntu-12.04/gitlab_7.8.2-omnibus.1-1_amd64.deb
  install_commands: |
-                    sudo dpkg -i gitlab_7.8.1-omnibus-1_amd64.deb
+                    sudo dpkg -i gitlab_7.8.2-omnibus.1-1_amd64.deb
  dependency_commands: |
                       sudo apt-get install openssh-server
                       sudo apt-get install postfix
 - name: ubuntu1404
  long_name: Ubuntu 14.04
-  download_command: wget https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.1-omnibus-1_amd64.deb
+  download_command: wget https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.2-omnibus.1-1_amd64.deb
  install_commands: |
-                    sudo dpkg -i gitlab_7.8.1-omnibus-1_amd64.deb
+                    sudo dpkg -i gitlab_7.8.2-omnibus.1-1_amd64.deb
  dependency_commands: |
                    sudo apt-get install openssh-server
                    sudo apt-get install postfix
  
 - name: debian7
  long_name: Debian 7
-  download_command: wget https://downloads-packages.s3.amazonaws.com/debian-7.8/gitlab_7.8.1-omnibus-1_amd64.deb
+  download_command: wget https://downloads-packages.s3.amazonaws.com/debian-7.8/gitlab_7.8.2-omnibus.1-1_amd64.deb
  install_commands: |
-                    sudo dpkg -i gitlab_7.8.1-omnibus-1_amd64.deb
+                    sudo dpkg -i gitlab_7.8.2-omnibus.1-1_amd64.deb
  dependency_commands: |
                    sudo apt-get install openssh-server
                    sudo apt-get install postfix
 - name: centos6
  long_name: CentOS 6 (and RedHat/Oracle/Scientific Linux 6)
-  download_command: curl -O https://downloads-packages.s3.amazonaws.com/centos-6.6/gitlab-7.8.1_omnibus-1.el6.x86_64.rpm
+  download_command: curl -O https://downloads-packages.s3.amazonaws.com/centos-6.6/gitlab-7.8.2_omnibus.1-1.el6.x86_64.rpm
  install_commands: |
-                    sudo rpm -i gitlab-7.8.1_omnibus-1.el6.x86_64.rpm
+                    sudo rpm -i gitlab-7.8.2_omnibus.1-1.el6.x86_64.rpm
  dependency_commands: |
                    sudo yum install openssh-server
                    sudo yum install postfix
@@ -46,9 +46,9 @@ platforms:
  firewall_open: sudo lokkit -s http -s ssh
 - name: centos7
  long_name: CentOS 7 (and RedHat/Oracle/Scientific Linux 7)
-  download_command: curl -O https://downloads-packages.s3.amazonaws.com/centos-7.0.1406/gitlab-7.8.1_omnibus-1.el7.x86_64.rpm
+  download_command: curl -O https://downloads-packages.s3.amazonaws.com/centos-7.0.1406/gitlab-7.8.2_omnibus.1-1.el7.x86_64.rpm
  install_commands: |
-                    sudo rpm -i gitlab-7.8.1_omnibus-1.el7.x86_64.rpm
+                    sudo rpm -i gitlab-7.8.2_omnibus.1-1.el7.x86_64.rpm
  dependency_commands: |
                    sudo yum install openssh-server
                    sudo systemctl enable sshd

--- a/source/features/index.html
+++ b/source/features/index.html
@@ -94,14 +94,12 @@ extra_js:
      </div>
      <div class="wide-img">
        <a href="/images/feature_page/mr.png" class="image-link"><img src="/images/feature_page/mr_sh.png" alt="" class="img-responsive"/></a>
+      </div>      
+      <div class="wide-feature-link">
+        <a class="btn-default" href="https://gitlab.com/gitlab-org/gitlab-ce/merge_requests">See the power of merge requests on GitLab.com</a>
      </div>
    </div>
-  </div>
  
-  <div class="container">
-    <div class="wide-feature-link">
-      <a class="btn-default" href="https://gitlab.com/gitlab-org/gitlab-ce/merge_requests">See the power of merge requests on GitLab.com</a>
-    </div>
  </div>
  
  <div class="container">
@@ -193,8 +191,7 @@ extra_js:
        </thead>
        <tbody class="header first">
          <tr>
-            <td colspan="3"><span>Extended authentication and authorization integration</span>
-            <i class="fa fa-chevron-up"></i>
+            <td colspan="3">Extended authentication and authorization integration
            </td>
          </tr>
          <tr>
@@ -231,8 +228,7 @@ extra_js:
        </tbody>  
        <tbody class="header">
          <tr>
-            <td colspan="3"><span>Fine-grained workflow management</span>
-              <i class="fa fa-chevron-down"></i>
+            <td colspan="3">Fine-grained workflow management
            </td>
          </tr>
          <tr>
@@ -246,7 +242,7 @@ extra_js:
            <td><i class="fa fa-check"></i></td>
          </tr>          
          <tr>
-            <td>Share a project with other groups</td>
+            <td><a href="http://doc.gitlab.com/ee/workflow/share_projects_with_other_groups.html">Share a project with other groups</a></td>
            <td></td>
            <td><i class="fa fa-check"></i></td>
          </tr>
@@ -273,8 +269,7 @@ extra_js:
        </tbody>
        <tbody class="header">
          <tr>
-            <td colspan="3"><span>Additional server management options</span>
-              <i class="fa fa-chevron-down"></i>
+            <td colspan="3">Additional server management options
            </td>
          </tr>
          <tr>
@@ -310,8 +305,7 @@ extra_js:
        </tbody>
        <tbody class="header">
          <tr>
-            <td colspan="3"><span>Deeper integration with your tool stack</span>
-            <i class="fa fa-chevron-down"></i>
+            <td colspan="3">Deeper integration with your tool stack
            </td>
          </tr>
          <tr>

--- a/source/gitlab-ci/index.html
+++ b/source/gitlab-ci/index.html
@@ -98,12 +98,12 @@ extra_js:
      </div>
    </div>
  
-    <hr class="divider" />
+    <hr class="divider" id="gitlab-runner"  />
  
    <div class="row gitlab-runner">
      <div class="col-xs-1 col-md-1"></div>
      <div class="col-xs-10 col-md-10">
-        <h1 id="gitlab-runner">GitLab Runner</h1>
+        <h1>GitLab Runner</h1>
        <p>To perform the actual build, you need to install GitLab Runner.</p>
        <ul>
          <li><a href="https://gitlab.com/gitlab-org/omnibus-gitlab-runner/blob/master/doc/install/README.md"><b>GitLab Runner Omnibus package for Linux</b></a> (the recommended way to install GitLab Runner)</li>

--- a/source/images/organizations/logo_1a.png
+++ b/source/images/organizations/logo_1a.png
--- a/source/images/organizations/logo_1b.png
+++ b/source/images/organizations/logo_1b.png
--- a/source/images/organizations/logo_1c.png
+++ b/source/images/organizations/logo_1c.png
--- a/source/images/organizations/logo_2a.png
+++ b/source/images/organizations/logo_2a.png