Merge branch 'no-license-doc' into 'master'

Refactor license doc

- Add section on missing license
- Move images in a separate directory

See merge request !457

app/views/admin/licenses/show.html.haml

 - page_title "License"
-%h3.page-title 
+%h3.page-title
   Your License
   = link_to 'Upload New License', new_admin_license_path, class: "btn btn-new pull-right"
 
@@ -27,7 +27,7 @@
           %span.light Started:
           %strong= time_ago_with_tooltip @license.starts_at
         %li
-          %span.light 
+          %span.light
             - if @license.expired?
               Expired:
             - else
@@ -62,12 +62,12 @@
 
           - if restricted && current > restricted
             %span.label.label-danger.pull-right
-              %strong 
+              %strong
                 Exceeds license limit
 
         - date_range = (Date.today - 1.year)..Date.today
         - historical = HistoricalData.during(date_range).maximum(:active_user_count)
-        - if historical 
+        - if historical
           %li
             %span.light Maximum active users:
             %strong
@@ -75,7 +75,7 @@
 
             - if restricted && historical > restricted
               %span.label.label-danger.pull-right
-                %strong 
+                %strong
                   Exceeds license limit
 
   .col-md-6
@@ -84,7 +84,7 @@
         Download license
       .panel-body
         %p Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your <code>.gitlab-license</code> file.
-        %p Still, we recommend keeping a backup saved somewhere. Otherwise, if you ever need it and have lost it, you will need to request GitLab B.V. to send it to you again.
+        %p Still, we recommend keeping a backup saved somewhere. Otherwise, if you ever need it and have lost it, you will need to request GitLab Inc. to send it to you again.
         %br
         = link_to 'Download license', download_admin_license_path, class: "btn btn-info"
 

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**.
+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)
+![upload.png](img/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.
+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)
+![enter.png](img/enter.png)
 
-Once you've uploaded your license, all GitLab Enterprise Edition functionality will be active until the end of the license period.
+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.
+You can review the license details at any time in the License section of the
+Admin Area.
 
-![details.png](details.png)
+![details.png](img/details.png)
+
+## Notification before the license expires
+
+One month before the license expires, a message informing when the expiration
+is due to will be shown to GitLab admins. Make sure that you update your license
+beforehand otherwise you will miss important features if it expires.
+
+![License expiration](img/expire_message.png)
+
+## What happens when my license expires?
+
+In case your license expires, you will not be able to push any commits to
+GitLab and creation of new issues and merge requests will be disabled.
+
+A message to inform of the locked state of GitLab will be presented to
+admins only.
+
+![No license message](img/no_license_message.png)