Skip to content
Snippets Groups Projects
Commit b6d1e492 authored by Job van der Voort's avatar Job van der Voort
Browse files

Merge branch 'development' into 'master' 

Development

/cc @Marc.Radulescu
parents d967fd8e dd163af0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
source/cloud/index.html
+ 8
− 4
View file @ b6d1e492
@@ -9,8 +9,12 @@ title: GitLab Cloud
<div class="entry">
<div class="row">
<div class="col-sm-12 col-md-12">
<p><span style="line-height:1.6;">Gitlab Cloud allows you to use GitLab without installing anything.</span><span style="line-height:1.6;"> To get a free account with unlimited private repositories and unlimited private collaborators please </span><a style="line-height:1.6;" title="sign up now" href="https://gitlab.com/users/sign_up">sign up now</a>.</p>
<h2><strong>Advantages of Gitlab Cloud</strong></h2>
<h2>Introduction</h2>
<p><span style="line-height:1.6;">Gitlab Cloud allows you to use GitLab without installing anything.</span><span style="line-height:1.6;"> To get a free account with unlimited private repositories and unlimited private collaborators please sign up now.
<div class="button-holder">
<a class="btn btn-info btn-lg" href="https://gitlab.com/users/sign_up"> Sign up</a>
</div><!-- button-holder -->
<h2><strong>Advantages</strong></h2>
<p>Gitlab.com makes using Gitlab more convenient: with our hosted Gitlab repositories, you can save yourself the burden of installing, maintaining and making backups of your Gitlab installation. Instead, you can instantly enjoy all the <a title="Features" href="https://www.gitlab.com/gitlab-ee/">great features</a> Gitlab has to offer. Getting started with Gitlab has never been easier. In addition to that, with Gitlab.com you get unlimited hosted private repository for free!</p>
<p><a href="http://demo.gitlab.com/">Try the demo now</a> (no account needed).</p>
<h2>What we offer</h2>
@@ -20,7 +24,7 @@ title: GitLab Cloud
<li>Unlimited disk space *</li>
<li>Completely free, no credit card required</li>
<li>Email Support</li>
<li>All the <a title="Features" href="https://www.gitlab.com/gitlab-ee/">great GitLab functionality</a></li>
<li>All the <a title="Features" href="https://www.gitlab.com/gitlab-ce-features/">GitLab CE functionality</a></li>
</ul>
<p><em>* For performance reasons there is a soft limit of 1GB per repository</em></p>
<h2>Security</h2>
@@ -34,7 +38,7 @@ title: GitLab Cloud
GitLab Cloud does not allow you to easily export your repositories, wiki's and issues to your own GitLab instance.
Of couse you can git clone the repositories and import then with <a href="https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/import.rake">a rake task</a>.
And since the wiki is backed by a git repo you can clone that as well.
But these are manual actions and for the issues there is no automation available except for <a href="http://api.gitlab.org/issues.html">the issue API</a>.
But these are manual actions and for the issues there is no automation available except for <a href="http://doc.gitlab.com/ce/api/issues.html">the issue API</a>.
So if you plan on using your own server eventually please consider doing so from the start.
</p>
</div>
source/consultancy/index.html
+ 21
− 20
View file @ b6d1e492
@@ -9,27 +9,28 @@ title: Consultancy
<div class="product-plan">
<ul class="plans list-unstyled">
<li>
<div class="action">
<div id="wufoo-rrsr4md1q53dik">
Please fill out this <a href="https://gitlab.wufoo.com/forms/rrsr4md1q53dik">online form</a>.
Use the form below to request an upgrade or installation of your GitLab server.
<div class="action">
<div id="wufoo-rrsr4md1q53dik">
Please fill out this <a href="https://gitlab.wufoo.com/forms/rrsr4md1q53dik">online form</a>.
</div>
<script type="text/javascript">var rrsr4md1q53dik;(function(d, t) {
var s = d.createElement(t), options = {
'userName':'gitlab',
'formHash':'rrsr4md1q53dik',
'autoResize':true,
'height':'2093',
'async':true,
'host':'wufoo.com',
'header':'show',
'ssl':true};
s.src = ('https:' == d.location.protocol ? 'https://' : 'http://') + 'wufoo.com/scripts/embed/form.js';
s.onload = s.onreadystatechange = function() {
var rs = this.readyState; if (rs) if (rs != 'complete') if (rs != 'loaded') return;
try { rrsr4md1q53dik = new WufooForm();rrsr4md1q53dik.initialize(options);rrsr4md1q53dik.display(); } catch (e) {}};
var scr = d.getElementsByTagName(t)[0], par = scr.parentNode; par.insertBefore(s, scr);
})(document, 'script');</script>
</div>
<script type="text/javascript">var rrsr4md1q53dik;(function(d, t) {
var s = d.createElement(t), options = {
'userName':'gitlab',
'formHash':'rrsr4md1q53dik',
'autoResize':true,
'height':'2093',
'async':true,
'host':'wufoo.com',
'header':'show',
'ssl':true};
s.src = ('https:' == d.location.protocol ? 'https://' : 'http://') + 'wufoo.com/scripts/embed/form.js';
s.onload = s.onreadystatechange = function() {
var rs = this.readyState; if (rs) if (rs != 'complete') if (rs != 'loaded') return;
try { rrsr4md1q53dik = new WufooForm();rrsr4md1q53dik.initialize(options);rrsr4md1q53dik.display(); } catch (e) {}};
var scr = d.getElementsByTagName(t)[0], par = scr.parentNode; par.insertBefore(s, scr);
})(document, 'script');</script>
</div>
</li>
</ul>
</div>
source/development/index.html 0 → 100644
+ 47
− 0
View file @ b6d1e492
---
layout: default
title: Development
---
<div id="content">
<div class="container">
<div class="row">
<div class="col-sm-9 col-md-9">
<div class="product-plan">
<ul class="plans list-unstyled">
<li>
<p>
If you are missing some functionality in GitLab you can sponsor the development of it.
<p>
After you send in the form below we will check if the feature is acceptable to include in GitLab. If so we will first email back with a minimum cost estimate. This is to make sure the expectations of the work that is involved are realistic.
<p>
If the minimum estimate matches your expectations we will work on a detailed estimate. If you accept the detailed estimate we will give you an estimated release date and start the work.
<p>
We will inform you when the feature is ready and <a href="https://gitlab.com/gitlab-org/gitlab-ce/blob/a88225b7689ab87b49908db23e1bebf1c7ea09d3/CHANGELOG#L8">note your sponsorship in the Changelog</a> (unless you ask us not to, no problem). From then on your feature is a part of GitLab and will probably be maintained without any additional cost to you.
<div class="action">
<div id="wufoo-scvcb721qd692i">
Fill out my <a href="https://gitlab.wufoo.com/forms/scvcb721qd692i">online form</a>.
</div>
<script type="text/javascript">var scvcb721qd692i;(function(d, t) {
var s = d.createElement(t), options = {
'userName':'gitlab',
'formHash':'scvcb721qd692i',
'autoResize':true,
'height':'2207',
'async':true,
'host':'wufoo.com',
'header':'show',
'ssl':true};
s.src = ('https:' == d.location.protocol ? 'https://' : 'http://') + 'wufoo.com/scripts/embed/form.js';
s.onload = s.onreadystatechange = function() {
var rs = this.readyState; if (rs) if (rs != 'complete') if (rs != 'loaded') return;
try { scvcb721qd692i = new WufooForm();scvcb721qd692i.initialize(options);scvcb721qd692i.display(); } catch (e) {}};
var scr = d.getElementsByTagName(t)[0], par = scr.parentNode; par.insertBefore(s, scr);
})(document, 'script');</script>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
source/services/index.html
+ 12
− 8
View file @ b6d1e492
@@ -6,21 +6,25 @@ title: Services
<div id="content" class="txt-middle">
<div class="container">
<div class="row">
<div class="col-sm-3 col-md-3">
<div class="col-sm-4 col-md-4">
<a href="/subscription"><h2>Subscription</h2></a>
<p>A subscription includes access to GitLab Enterprise Edition and support.</p>
<p>Support and access to GitLab Enterprise Edition</p>
</div>
<div class="col-sm-3 col-md-3">
<div class="col-sm-4 col-md-4">
<a href="/consultancy"><h2>Consultancy</h2></a>
<p>Hire us to help you.</p>
<p>Upgrade or install GitLab</p>
</div>
<div class="col-sm-3 col-md-3">
<div class="col-sm-4 col-md-4">
<a href="/development"><h2>Development</h2></a>
<p>Add a new feature to GitLab</p>
</div>
<div class="col-sm-4 col-md-4">
<a href="/training"><h2>Training</h2></a>
<p>Git training workshops.</p>
<p>Git training workshop</p>
</div>
<div class="col-sm-3 col-md-3">
<div class="col-sm-4 col-md-4">
<a href="/cloud"><h2>Cloud</h2></a>
<p>Use GitLab without installing anything.</p>
<p>Use GitLab for free</p>
</div>
</div>
</div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment