Merge branch 'license-docs' into 'master'

Add license upload docs

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/113

[ci skip]

See merge request !89

app/helpers/license_helper.rb

@@ -16,7 +16,7 @@ module LicenseHelper
     message << "No GitLab Enterprise Edition license has been provided yet."
     message << "Pushing code and creation of issues and merge requests has been disabled."
 
-    message << 
+    message <<
       if is_admin
         "Upload a license in the admin area"
       else
@@ -44,7 +44,7 @@ module LicenseHelper
     if license.expired? && license.will_block_changes?
       message << "Pushing code and creation of issues and merge requests"
 
-      message << 
+      message <<
         if license.block_changes?
           "has been disabled."
         else
@@ -52,7 +52,7 @@ module LicenseHelper
         end
     end
 
-    message << 
+    message <<
       if is_admin
         "Upload a new license in the admin area"
       else

doc/README.md

@@ -57,6 +57,7 @@
 - [Git Hooks](git_hooks/git_hooks.md) Advanced push rules for your project.
 - [Help message](customization/help_message.md) Set information about administrators of your GitLab instance.
 - [Install](install/README.md) Requirements, directory structures and installation from source.
+- [Installing your license](license/README.md)
 - [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
 - [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages.
 - [Libravatar](customization/libravatar.md) Use Libravatar for user avatars.

doc/license/README.md

+# Installing your license
+
+To activate all GitLab Enterprise Edition functionality, you need to upload a license.
+Once you've received your license from GitLab Inc., you can upload it by signing into your GitLab instance as an admin, and navigating to **Admin Area > License**.
+
+If you've received a `.gitlab-license` file, you can upload it directly.
+
+![upload.png](upload.png)
+
+If you've received your license as plain text, you need to select the "Enter license key" option, copy the license and paste it into the "License key" field.
+
+![enter.png](enter.png)
+
+Once you've uploaded your license, all GitLab Enterprise Edition functionality will be active until the end of the license period.
+
+You can review the license details at any time in the License section of the Admin Area.
+
+![details.png](details.png)