Merge branch '6.9-release' into 'master'

6.9 release blog post

source/_posts/2014-05-22-gitlab-6-9-ee-and-ce-release.markdown

+---
+layout: post
+title: "GitLab 6.9 EE and CE released"
+date: 2014-05-22
+comments: true
+categories:
+author: Marin Jankovski
+---
+
+GitLab is open source software to collaborate on code.
+Today we announce the release of a new version of GitLab Enterprise Edition (EE) and GitLab Community Edition (CE), with new features, usability and performance improvements, and bug fixes.
+The main new feature of CE release is a two step creation process for merge requests.
+In addition to the updates from Community Edition, GitLab Enterprise Edition can now integrate Jenkins CI.
+
+Other changes include improvements in how comments are loaded and markdown is previewed during editing. Additionally, several new API features have been added.
+
+This month's Most Valuable Person is Evgeniy Sokovikov for contributing preview when editing a markdown file in the web editor.
+
+Thanks Evgeniy!
+
+<!--more-->
+
+## Two step Merge Request process
+
+We have reworked Merge Request creation process to make the workflow more natural.
+
+When creating a new merge request in GitLab 6.9, you are shown a comparison of the branches before actually creating the MR.
+By comparing the branches before creating the MR, a "nothing to merge" situation is prevented. When there are differences between the two branches, MR title will be pre-filled with source branch name, you can enter a description of the MR and assign a user/milestone before submitting the MR.
+
+[![screenshot](/images/6_9/mr1.png)](/images/6_9/mr1.png)
+
+[![screenshot](/images/6_9/mr2.png)](/images/6_9/mr2.png)
+
+## Markdown preview or diff when using web editor
+
+Thanks to the contribution by Evgeniy Sokovikov, editing files via the web editor is now more convenient.
+
+When editing a file you can now view the diff before commiting the changes.
+If the file is a markdown file, you can preview the changes before commiting.
+
+[![screenshot](/images/6_9/edit1.png)](/images/6_9/edit1.png)
+
+[![screenshot](/images/6_9/edit2.png)](/images/6_9/edit2.png)
+
+## Merge Request labels
+
+Thanks to contribution by Drew Blessing we can add labels to merge request.
+
+[![screenshot](/images/6_9/mr_labels.png)](/images/6_9/mr_labels.png)
+
+## New API features
+
+Thanks to sponsoring by O'Reilly Media it is now possible to accept [Merge Requests through the API](https://gitlab.com/gitlab-org/gitlab-ce/blob/6-9-stable/CHANGELOG#L18).
+
+You can read more about the GitLab API at [doc.gitlab.com/ce/api](http://doc.gitlab.com/ce/api/README.html).
+
+## Jenkins CI integration (EE only feature)
+
+GitLab 6.9 EE can be configured to interact with Jenkins CI.
+
+Jenkins builds can be triggered by pushes to a repository and the build status can be shown on merge requests.
+
+[![screenshot](/images/6_9/jenkins.png)](/images/6_9/jenkins.png)
+
+## Interacting with Jira (EE only feature)
+
+Before GitLab 6.9, GitLab could be configured to use external issue trackers like Jira. This meant that Issues would link to Jira.
+
+In GitLab 6.9 EE, GitLab goes one step further in integrating Jira by allowing tickets to be closed by commit messages and merge request mentions.
+
+For example, commit message "New feature. Fixes JIRA-123" would create a comment in ticket JIRA-123 with a link to the commit and would close the ticket in Jira.
+
+[![screenshot](/images/6_9/jira.png)](/images/6_9/jira.png)
+
+- - -
+
+# Install
+
+If you are setting up a new GitLab installation see the [installation section of the README](https://gitlab.com/gitlab-org/gitlab-ce/blob/6-9-stable/README.md#installation).
+
+# Update
+
+Upgrade instructions for omnibus-gitlab packages can be found in [the omnibus-gitlab repository](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/update.md).
+
+If you installed GitLab from source and you have version 6.4.2 or higher you can use the [upgrade script](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/upgrader.md).
+You have to update GitLab Shell to 1.9.4 manually, see [point 3 of the upgrade guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/6.8-to-6.9.md#3-update-gitlab-shell-and-its-config).
+
+If you still want to do it manually - see the [Update Guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/6.8-to-6.9.md).
+
+# Enterprise
+
+For LDAP group support and more have a look at the [feature list of GitLab Enterprise Edition](http://www.gitlab.com/gitlab-ee/).
+
+Access to GitLab Enterprise Edition is included with a [GitLab.com subscription](http://www.gitlab.com/subscription/).
+
+No time to upgrade or maintain Gitlab yourself?
+GitLab.com also offers upgrade and installation services as part of a [GitLab.com subscription](http://www.gitlab.com/subscription/) or alternatively on a [consultancy basis](http://www.gitlab.com/consultancy/).
+
+- - -

source/downloads/archives/index.html

@@ -28,6 +28,11 @@ title: GitLab CE Download Archives
                     </tr>
                   </thead>
                   <tbody>
+                  <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_6.8.2-omnibus-1_amd64.deb">gitlab_6.8.2-omnibus-1_amd64.deb</a></td>
+                    <td>b21dbadc890b8a6eb405e1771eea4d73</td>
                   <tr>
                     <td><img src="/images/ubuntu.png"></td>
                     <td>Ubuntu 12.04 LTS 64bit</td>
@@ -88,12 +93,25 @@ title: GitLab CE Download Archives
                       <td><a href="https://downloads-packages.s3.amazonaws.com/gitlab_6.6.0-pre1.omnibus.2-1.ubuntu.12.04_amd64.deb">gitlab_6.6.0-pre1.omnibus.2-1.ubuntu.12.04_amd64.deb</a></td>
                       <td>d9702efc7fe13d4033c50a3c382b0227</td>
                     </tr>
+                  <tr>
+                    <td><img src="/images/debian.png"></td>
+                    <td>Debian 7.4 64bit</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/debian-7.4/gitlab_6.8.2-omnibus-1_amd64.deb">gitlab_6.8.2-omnibus-1_amd64.deb</a></td>
+                    <td>499fa23196fb139b09c15335014a5463</td>
+                  </tr>
+                  <tr>
                   <tr>
                     <td><img src="/images/debian.png"></td>
                     <td>Debian 7.4 64bit</td>
                     <td><a href="https://downloads-packages.s3.amazonaws.com/debian-7.4/gitlab_6.8.1-omnibus.4-1_amd64.deb">gitlab_6.8.1-omnibus.4-1_amd64.deb</a></td>
                     <td>e3696d1adc4872f067ed16b020ef55d2</td>
                   </tr>
+                  <tr>
+                    <td><img src="/images/centos.png"></td>
+                    <td>CentOS 6.5 64bit (compatible with all Enterprise Linux 6.x distribitions)</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/centos-6.5/gitlab-6.8.2_omnibus-1.el6.x86_64.rpm">gitlab-6.8.2_omnibus-1.el6.x86_64.rpm</a></td>
+                    <td>e691eff2f7c82571c6b011c00fc64196</td>
+                  </tr>
                   <tr>
                     <td><img src="/images/centos.png"></td>
                     <td>CentOS 6.5 64bit (compatible with all Enterprise Linux 6.x distribitions)</td>

source/downloads/index.html

@@ -28,20 +28,20 @@ title: GitLab Community Edition (CE) Downloads
                   <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_6.8.2-omnibus-1_amd64.deb">gitlab_6.8.2-omnibus-1_amd64.deb</a></td>
-                    <td>b21dbadc890b8a6eb405e1771eea4d73</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/ubuntu-12.04/gitlab_6.9.0-omnibus-1_amd64.deb">gitlab_6.9.0-omnibus-1_amd64.deb</a></td>
+                    <td>c972cdb0262a70f46cb3900a31d0f680</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.4/gitlab_6.8.2-omnibus-1_amd64.deb">gitlab_6.8.2-omnibus-1_amd64.deb</a></td>
-                    <td>499fa23196fb139b09c15335014a5463</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/debian-7.4/gitlab_6.9.0-omnibus-1_amd64.deb">gitlab_6.9.0-omnibus-1_amd64.deb</a></td>
+                    <td>aecabb2f75631fad8e59dbdc8addbf04</td>
                   </tr>
                   <tr>
                     <td><img src="/images/centos.png"></td>
                     <td>CentOS 6.5 64bit (compatible with all Enterprise Linux 6.x distribitions)</td>
-                    <td><a href="https://downloads-packages.s3.amazonaws.com/centos-6.5/gitlab-6.8.2_omnibus-1.el6.x86_64.rpm">gitlab-6.8.2_omnibus-1.el6.x86_64.rpm</a></td>
-                    <td>e691eff2f7c82571c6b011c00fc64196</td>
+                    <td><a href="https://downloads-packages.s3.amazonaws.com/centos-6.5/gitlab-6.9.0_omnibus-1.el6.x86_64.rpm">gitlab-6.9.0_omnibus-1.el6.x86_64.rpm</a></td>
+                    <td>277482450a8a1a006994b64568633919</td>
                   </tr>
                 </tbody>
               </table>