Commit 74060ee2 authored by Patricio Cano's avatar Patricio Cano

Merge branch 'master' into glu-updates-se

# Conflicts:
#	source/handbook/support/index.md
parents 343936c1 77dd5e91
......@@ -427,7 +427,7 @@ task :clean do
end
desc "Build website in #{BUILD_DIR}"
task :build => [:clean, :release_list, :generate, :pdfs]
task :build => [:clean, :release_list, :direction_issues, :generate, :pdfs]
rule %r{^public/.*\.pdf} => [->(f) { f.pathmap('%X.html') }] do |pdf|
# Rewrite the generated HTML a bit, fix relative image links for pandoc
......
require 'httparty'
PRIVATE_TOKEN = ENV["private_gl_token"]
PRIVATE_TOKEN = ENV["PRIVATE_TOKEN"]
class GitLabInstance
def initialize(endpoint, private_token, name)
......@@ -9,9 +9,9 @@ class GitLabInstance
@name = name
end
def call(path)
url = @endpoint + path + "?private_token=#{@private_token}"
data = HTTParty.get(url)
def call(path, params = "")
url = @endpoint + path + params
HTTParty.get(url, headers: { "PRIVATE-TOKEN" => PRIVATE_TOKEN })
end
def name
......@@ -40,12 +40,8 @@ class GitLabProject
@instance.call("/projects/#{@id}/milestones/#{milestone_id}")
end
def milestone_issues(milestone_id)
@instance.call("/projects/#{@id}/milestones/#{milestone_id}/issues")
end
def milestone_direction_issues
@instance.call("/projects/#{@id}/milestones/#{milestone_id}/issues?labels=direction&state=opened")
def milestone_direction_issues(milestone_id)
@instance.call("/projects/#{@id}/issues", "?milestone=#{milestone_id}&labels=direction")
end
def name
......@@ -67,28 +63,22 @@ end
desc 'Generate Direction Page Issue List'
task :direction_issues do
puts 'Generating direction page..'
print 'Generating direction page'
com = GitLabInstance.new('https://gitlab.com', PRIVATE_TOKEN, 'GitLab.com')
ce = GitLabProject.new('gitlab-org%2Fgitlab-ce',com)
ee = GitLabProject.new('gitlab-org%2Fgitlab-ee',com)
ar = [ce,ee]
edition = [ce,ee]
output = ''
ar.each do |project|
edition.each do |project|
milestones = project.milestones
output << "## #{project.name}\n\n"
milestones.each do |ms|
if ms["due_date"] && Date.parse(ms["due_date"]) > Date.today
issues = project.milestone_issues(ms["id"])
issues = project.milestone_direction_issues(ms["title"])
output << "### [#{ms["title"]}](#{project.web_url}/milestones/#{ms["iid"]}) \n\n"
issues.each do |issue|
......@@ -102,7 +92,7 @@ task :direction_issues do
end
end
file_path = "source/direction2/index.md"
file_path = "source/direction/index.md"
original_file = File.read(file_path)
new_contents = original_file.gsub(/<!-- direction_issues -->/, output)
......
......@@ -53,6 +53,11 @@
link: http://doc.gitlab.com/ee/workflow/ff_merge.html
- description: Git hooks (commit message must mention an issue, no tag deletion, etc.)
link: http://doc.gitlab.com/ee/git_hooks/git_hooks.html
- description: Webhooks at Project Level
link: http://doc.gitlab.com/ee/web_hooks/web_hooks.html
in_ce: true
- description: Webhooks at Group Level
link: http://doc.gitlab.com/ee/web_hooks/web_hooks.html
- description: Lock project membership to the members of a group
link: http://doc.gitlab.com/ee/workflow/groups.html
- description: Approve Merge Requests
......
......@@ -599,7 +599,7 @@
Michael has been helping customers choose, deploy, and use software development tools since the 80's at companies like Borland, Symantec, Gupta, and Perforce. Michael is passionate about building teams and business in the far-flung corners of the world. When not working, Michael is an award winning wine maker and heavily involved in the local Boy Scouts.
- name: Pablo Carranza
role: Senior <a href="https://about.gitlab.com/jobs/production-engineer/">Production Engineer</a>
role: Senior <a href="https://about.gitlab.com/jobs/production-engineer/">Production Engineer</a> and operations lead
reports_to: CEO
picture: pablo.jpg
twitter: psczg
......@@ -696,7 +696,25 @@
gitlab:
story: |
Joining March 9th
name: E.A.
role: <a href="https://about.gitlab.com/jobs/frontend-engineer/">Frontend Engineer</a>
reports_to: CTO
picture: logo-extra-whitespace.png
twitter:
gitlab:
story: |
Joining March 14th
name: J.B.
role: <a href="https://about.gitlab.com/jobs/strategic-relations-manager/">Strategic Relations Manager</a>
reports_to: CEO
picture: logo-extra-whitespace.png
twitter:
gitlab:
story: |
Joining March 15th
- name: T.A.
role: <a href="https://about.gitlab.com/jobs/developer/">Developer</a>
reports_to: Development Lead
......
......@@ -19,4 +19,4 @@ comments: false
<a href="http://blog.gitlabhq.com/wp-content/uploads/2012/01/1328709.png"><img src="http://blog.gitlabhq.com/wp-content/uploads/2012/01/1328709-300x145.png" alt="" title="1328709" width="300" height="145" class="alignleft size-medium wp-image-207" /></a>
<h2>and deploy keys, web hooks, etc</h2>
<h2>and deploy keys, webhooks, etc</h2>
......@@ -30,7 +30,7 @@ And today we announced another FOSS software for developers. Its GitLab CI.
**GitLab CI supports only git SCM.**
**GitLab CI requires present of GitLab instance with web hooks setup to make builds automatically**
**GitLab CI requires present of GitLab instance with webhooks setup to make builds automatically**
### How it works:
......@@ -38,9 +38,9 @@ And today we announced another FOSS software for developers. Its GitLab CI.
2. Then you clone projects you want to test and setup test environment
3. Next step is just add projects to GitLab CI via web UI
![Screenshot](/images/gitlab_ci_new_project.png)
4. Add just copy HTTP POST url provided by GitLab CI to your GitLab web hooks
4. Add just copy HTTP POST url provided by GitLab CI to your GitLab webhooks
![Screenshot](/images/gitlab_ci_project.png)
5. When you push code to GitLab web hook will trigger CI to make a build
5. When you push code to GitLab webhook will trigger CI to make a build
[Source Code](https://github.com/gitlabhq/gitlab-ci)
......@@ -32,7 +32,7 @@ We improved performance, fixed some bugs, added teams, users pages and more
2. Performance:
* Async gitolite calls
* Process web hooks async
* Process webhooks async
3. Permissions:
......
......@@ -84,7 +84,7 @@ Misc:
- Group owner or admin can remove other group owners
- Make default user theme configurable (Izaak Alpert)
- Update logic for validates_merge_request for tree of MR (Andrew Kumanyaev)
- Rake tasks for web hooks management (Jonhnny Weslley)
- Rake tasks for webhooks management (Jonhnny Weslley)
- Fixed relative links in markdown
- - -
......
......@@ -44,10 +44,10 @@ It is hidden from the dashboard and it does not show up in searches.
Archived projects you have access to will still be listed on your profile page (gitlab.example.com/u/my_user).
### Project web hooks
### Project webhooks
Project web hooks were extended with new types of events.
Web hooks can now also be triggered when an issue is created or a merge requst is closed.
Project webhooks were extended with new types of events.
Webhooks can now also be triggered when an issue is created or a merge requst is closed.
[![screenshot](/images/6_4/hook.png)](/images/6_4/hook.png)
......
......@@ -43,11 +43,11 @@ This way we can ensure that killing the script also kills all its child processe
__We would like to thank Corin Langosch for contributing these improvements.__
## Web hooks
## Webhooks
In order to build some services based on GitLab CI you may need hooks that send data when the build finishes.
GitLab already has such hooks, but up until now, GitLab CI did not.
With GitLab CI version 5, we have added web hook functionality. We thank Võ Anh Duy for help with this feature.
With GitLab CI version 5, we have added webhook functionality. We thank Võ Anh Duy for help with this feature.
[![screenshot](/images/ci_5/hooks.png)](/images/ci_5/hooks.png)
......
......@@ -45,7 +45,7 @@ with the following outline:
3. Managing users, groups and permissions
4. Issue tracker and Wiki
5. Maintaining your GitLab instance
6. Web hooks, external services and the API
6. Webhooks, external services and the API
7. Using LDAP and omniauth providers
8. GitLab CI
9. Appendix
......
......@@ -65,8 +65,8 @@ Blocking user will not remove users from their projects and groups. GitLab 7.9 w
## Group level webhooks (EE only feature)
In earlier versions of GitLab you were able to add a web hook for a project.
Share the same web hooks between multiple projects - just setup it once in group.
In earlier versions of GitLab you were able to add a webhook for a project.
Share the same webhooks between multiple projects - just setup it once in group.
[![screenshot](/images/7_9/group-hooks.png)](/images/7_9/group-hooks.png)
......
......@@ -35,7 +35,7 @@ See our [documentation on how to setup SAML integration](http://doc.gitlab.com/c
## Web Hook for Comments
There is a new web hook available that will trigger on all comments.
There is a new webhook available that will trigger on all comments.
You could use this to add additional automations and integrations to GitLab.
For instance when someone comments on a merge request, you can have it
trigger internal systems or, depending on the comment contents,
......
......@@ -161,16 +161,16 @@ in adding PostgreSQL compatibility.
How quickly these are solved will determine if GitLab 8.1 will ship
with Rocket Chat or whether it will be delayed.
## SSL Verification for Web Hooks
## SSL Verification for Webhooks
We've now enabled SSL verification for web hooks by default.
This makes web hooks safer to use and helps mitigate man-in-the-middle attacks.
We've now enabled SSL verification for webhooks by default.
This makes webhooks safer to use and helps mitigate man-in-the-middle attacks.
You can turn this off in the web hook settings of a project.
You can turn this off in the webhook settings of a project.
![Configure SSL verification of Web Hooks](/images/8_0/webhooks.png)
![Configure SSL verification of Webhooks](/images/8_0/webhooks.png)
* [View the documentation for Web Hooks](http://doc.gitlab.com/ce/web_hooks/web_hooks.html)
* [View the documentation for Webhooks](http://doc.gitlab.com/ce/web_hooks/web_hooks.html)
## Public User Profile and Group Pages
......@@ -289,7 +289,7 @@ One of the biggest improvements of GitLab 8.0 is integrated GitLab CI.
Doing that required large amount of changes, including rebuild of the GitLab CI Service in GitLab.
With all these changes we removed the GitLabCiService. This change broke the Jenkins [gitlab-plugin](https://github.com/jenkinsci/gitlab-plugin) that allowed Jenkins to act as an external GitLab CI in front of GitLab.
You can still use [mentioned plugin](https://github.com/jenkinsci/gitlab-plugin) with GitLab. For all Web Hooks that you added you need to enable not only *Merge Request Events*, but also *Push and Tag Events*. By doing that GitLab will properly notify Jenkins when you do **git push**. This doesn't resolve missing build status for Jenkins builds in GitLab interface. We are working hard to bring the Commit Status API that will allow any external service to post the build status back to GitLab. When this gets implemented by the maintainer of this plugin it will make the integration much better then it was in versions prior to 8.0.
You can still use [mentioned plugin](https://github.com/jenkinsci/gitlab-plugin) with GitLab. For all Webhooks that you added you need to enable not only *Merge Request Events*, but also *Push and Tag Events*. By doing that GitLab will properly notify Jenkins when you do **git push**. This doesn't resolve missing build status for Jenkins builds in GitLab interface. We are working hard to bring the Commit Status API that will allow any external service to post the build status back to GitLab. When this gets implemented by the maintainer of this plugin it will make the integration much better then it was in versions prior to 8.0.
- - -
......
......@@ -50,7 +50,7 @@ CI!
What started as a side project [three years ago][ci-first-post], has now
become one of GitLab's key features. Back then, it was a separate application
that talked to GitLab via web hooks. Now, starting from GitLab 8.0,
that talked to GitLab via webhooks. Now, starting from GitLab 8.0,
GitLab CI has been [fully integrated with GitLab itself][8-post]. No more need
to setup and maintain another application, which means less work for you or
your Ops team.
......
---
layout: post
title: "GitLab 8.5.5 Released"
date: 2016-03-10 17:00
comments: true
author: GitLab
author_twitter: gitlab
filename: 2016-03-10-gitlab-8-dot-5-dot-5-released.markdown
---
Today we are releasing version 8.5.5 for GitLab Community Edition (CE) and
Enterprise Edition (EE).
This version includes a new GitLab Geo feature and fixes, several minor EE fixes
as well as fixes for Todos and project lists.
Read on for all the details!
<!-- more -->
- **EE:** GitLab Geo: Repository synchronization between primary and secondary nodes ([!179])
- **EE:** Refactor user documentation for GitLab Pages ([!212])
- **EE:** Fix importing projects from GitHub Enterprise Edition ([!219])
- **EE:** Fix syntax error in init file ([!223])
- **EE:** GitLab Geo: Improve GeoNodes Admin screen ([!251])
- **EE:** GitLab Geo: Avoid locking yourself out when adding a GeoNode ([!252])
- **EE:** Only show group member roles if explicitly requested ([!3044])
- **CE/EE:** Ensure removing a project removes associated Todo entries ([!3141])
- **CE/EE:** Prevent a 500 error in Todos when author was removed ([!3141])
- **CE/EE:** Fix pagination for filtered dashboard and explore pages ([!3149])
- **CE/EE:** Fix "Show all" link behavior on profile page ([!3159])
- **Omnibus GitLab:** Add ldap_sync_time global configuration as the EE is still supporting it ([!679])
[!179]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/179
[!212]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/212
[!219]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/219
[!223]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/223
[!251]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/251
[!252]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/252
[!3044]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3044
[!3141]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3141
[!3149]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3149
[!3159]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3159
[!679]: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/679
## Upgrade barometer
This release includes one minor database migration for CE and two minor
migrations for EE. All the migrations can be run without causing any downtime.
Please be aware that by default the Omnibus packages will stop, run migrations,
and start again, no matter how “big” or “small” the upgrade is. This behavior
can be changed by adding a [`/etc/gitlab/skip-auto-migrations`
file](http://doc.gitlab.com/omnibus/update/README.html).
## Updating
To update, check out our [update page](https://about.gitlab.com/update).
## Enterprise Edition
Interested in GitLab Enterprise Edition? Check out the [features exclusive to
EE](https://about.gitlab.com/features/#enterprise).
Access to GitLab Enterprise Edition is included with a [subscription](https://about.gitlab.com/pricing/).
No time to upgrade GitLab yourself? Subscribers receive upgrade and installation
services.
---
layout: post
title: "GitLab Intro Webcast: Workflow"
date: 2016-03-11
comments: true
categories: webcast
author: Heather McNamee
author_twitter: nearlythere
image_title: '/images/unsplash/moving-parts.jpg'
---
In our latest webcast, we highlighted a typical daily workflow when using GitLab.
We looked at features in GitLab which emphasize conversation, collaborating
early, improving discoverability, and keeping your momentum going.
[Job](http://twitter.com/jobvo) showed how he starts his day, checking his todo list,
providing feedback on issues, line-by-line code review, and getting to work on his
own commits.
This demo is based on [GitLab Flow](http://doc.gitlab.com/ee/workflow/gitlab_flow.html)
which is lightweight and scales easily for even large teams.
Watch the recording below.
Sign up to our [newsletter](https://about.gitlab.com/contact/#newsletter)
so you don't miss our webcasts!
<!-- more -->
In this webcast:
- Overview of Groups and Projects
- Always start with an issue
- Organizing with Labels and Milestones
- Referencing related work such as @mentions, Fixes #ID or Closes #ID
- Q&A: Questions from webcast attendees answered live
## Webcast Recording
<iframe width="560" height="315" src="https://www.youtube.com/embed/enMumwvLAug" frameborder="0" allowfullscreen></iframe>
## Webcast Slides
<script async class="speakerdeck-embed" data-id="c2b377cf10694aef81828d567de01b87" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
## Join our next webcasts!
Can't make these times? Register anyway, and we'll send you a link to watch later.
In our next webcast on March 24th, we'll take a look at the new features in GitLab 8.6!
- Date: Thursday, March 24, 2016
- Time: 5pm (17:00) UTC; 12pm EST; 9am PST
- [Register here][webcast1]
In the following webcast, we'll focus entirely on GitLab CI.
- Date: Thursday, April 14, 2016
- Time: 5pm (17:00) UTC; 12pm EST; 9am PST
- [Register here][webcast2]
[webcast1]: http://page.gitlab.com/mar242016-release-webcast.html
[webcast2]: http://page.gitlab.com/apr-2016-gitlab-intro-ci-webcast.html
\ No newline at end of file
---
layout: post
title: "GitLab: In case you missed it"
date: 2016-03-14
comments: true
author: Ivan Nemytchenko
author_twitter: inemation
image_title: '/images/unsplash/key-concepts.jpg'
---
I've recently joined GitLab as a Developer Advocate.
Part of my role will be traveling to community events where I hope we'll meet in person.
I'm also an experienced Ruby developer.
As a rubyist, naturally, I've heard about GitLab and even tried to use it.
The first two weeks working with GitLab have been full of pleasant surprises and dispelled delusions.
If you haven't been following GitLab for the last two years, this post is for you.
<!--more-->
## GitLab.com
You don't have to download and install GitLab nowadays.
You can simply [sign up for GitLab.com](https://gitlab.com/users/sign_in) and host your own repositories.
Even the private ones.
Yes, for free and without any restrictions.
No, there is no catch.
It should be noted that repositories are actually called "projects".
And that is not the only thing that catches your eye at first.
As it turns out, the unusual terminology is, in fact, justified.
## The terminology
These aren't just fancy terms to stand out from the crowd.
I strongly recommend reading the article about [GitLab, Github and Bitbucket and terms comparison](https://about.gitlab.com/2016/01/27/comparing-terms-gitlab-github-bitbucket/), if you wish to sort out the details.
I'd like to bring up the "Merge requests" topic, as it's the most controversial.
My initial reaction, naturally, was rejection. Most of us are accustomed to
"Pull requests", so what's the big idea?
But then I remembered that the title "Pull request" never did make perfect
sense to me because closing a pull request actually does branch merging.
As it turns out, there is a command [`git request-pull`](https://git-scm.com/docs/git-request-pull),
hence the feature title.
Pull requests have hothing in common with this git command. So, technically the correct name is "merge request".
[Learn more](https://about.gitlab.com/2016/01/27/comparing-terms-gitlab-github-bitbucket/) on terminology differences, if you're interested.
The terminology was just a part of the deal.
When reading the documentation, I discovered something called "omnibus" and
found some mysterious "runners" and "shared runners" in the settings.
But first things first.
Runners are connected to CI.
Omnibus is related to GitLab installation on your own server.
## Continuous Integration (CI)
Continuous Integration is a best practice in software development.
For example, a CI server runs your tests every time you push changes to the repository.
As a rule, CI is a separate service.
But in GitLab, [CI is embedded](http://docs.gitlab.com/ce/ci/).
If you had to manually connect two services before, it just works on its own in GitLab.
Though you can still use other continuous integration services such as [Jenkins](http://doc.gitlab.com/ee/integration/jenkins.html).
And it works through runners.
## Runners
A runner is a virtual machine that runs your tests, builds your builds or generates static files for your websites.
GitLab.com users are able to make use of a special [Shared Runners](http://doc.gitlab.com/ce/ci/quick_start/README.html#shared-runners) pool to simply make everything work.
Since the pool is shared across all projects on GitLab.com, sometimes it can
take a while to wait for your project's build to be processed.
If you are not satisfied with the Shared runners performance, you can
[setup a runner](https://about.gitlab.com/2016/03/01/gitlab-runner-with-docker/)
on your own server and connect it to one or more projects.
Don't forget that you can install GitLab on your own server as well.
## GitLab installation with Omnibus
In the past, you could only install GitLab manually.
Now you can install and update the service from packages thanks to Omnibus.
[Omnibus](http://doc.gitlab.com/omnibus) is a tool developed by Chef
that helps to create installation packages for complex software with a lot of
components for various platforms.
Any installation using Omnibus lasts for 2-6 minutes tops, depending on your server performance.
This is what GitLab installation looks like on Ubuntu 14.04 using a relatively slow VPS with 2Gb running memory:
<script type="text/javascript" src="https://asciinema.org/a/39151.js" id="asciicast-39151" async></script>
Hint: in case you'd prefer not to mess with console installation and updates at
all, you can simply rent a GitLab server on [Githost.io](https://githost.io/)
Both Omnibus and built-in CI are just a portion of what is being done to make developers' jobs easier.
Let us review a few features.
## Small features that make a difference
### Merge when build succeeds
With GitLab, you don't have to wait for your build to turn green to finally merge the branch.
You can simply ask GitLab to do that for you.
![Merge when build succeeds](/images/automerge.jpg)
### Publishing with GitLab Pages
GitLab Pages runs on top of the built-in CI.
Thanks to the feature, you can host websites created by any static site generators on GitLab.
Fork a repo from [GitLab examples](https://gitlab.com/groups/gitlab-examples?utf8=%E2%9C%93&filter_projects=pages-)
or figure out GitLab CI settings to forget all about the manual static generation.
You simply push your changes to the repository and GitLab generates and deploys everything on its own.
Custom CNAME and TLS [are supported](http://doc.gitlab.com/ee/pages/README.html#add-a-custom-domain-to-your-pages-website).
These kinds of features have become possible due to the synergy between system components.
There's much more coming.
## GitLab Direction
Please don't be surprised once a crashed build creates a TODO automatically or GitLab introduces built-in chat.
If you want to know where GitLab is heading, keep an eye on the [Direction page](https://about.gitlab.com/direction/).
This includes not only the short term objectives for the next release, but also the long-range vision.
* * *
Hopefully, this article has helped you to fill in the gaps in understanding what GitLab is now.
I'm planning to write two more articles: about migrating personal projects to GitLab and about contributing to GitLab.
Stay tuned and [follow me on Twitter](https://twitter.com/inemation).
I'm always happy to answer your questions in comments or personally.
Over the next several weeks I will be speaking at the following Ukrainian Ruby-meetups, where we can catch up:
- [Ruby Meditation, Kiev](https://www.facebook.com/events/406794219490854/) (March 18)
- [Pivorak, Lviv](https://www.facebook.com/pivorak/) (March 26)
## Join our webcast about GitLab CI.
I mentioned Gitlab CI a few times in this blog post. If you're interested,
we'll have a live webcast all about GitLab CI.
- Date: Thursday, April 14, 2016
- Time: 5pm (17:00) UTC; 12pm EST; 9am PST
- [Register here][webcast]
Can't make these times? Register anyway, and we'll send you a link to watch later.
[webcast]: http://page.gitlab.com/apr-2016-gitlab-intro-ci-webcast.html
......@@ -305,14 +305,14 @@ An iOS app for managing your GitLab projects on iPhone or iPad. GitLab Control g
<div class="col-md-4">
<div class="app">
<h4>GitLab Listener</h4>
<p>JIRA add-on allowing the reception of GitLab push events using GitLab project web hooks.</p>
<p>JIRA add-on allowing the reception of GitLab push events using GitLab project webhooks.</p>
<a href="https://marketplace.atlassian.com/plugins/com.allenta.jira.plugins.gitlab.gitlab-listener">Atlassian Marketplace</a>
</div>
</div>
<div class="col-md-4">
<div class="app">
<h4>GitLab IRC gateway</h4>
<p>IRC notifications using web hooks, implemented with the <a href="http://www.catb.org/esr/irker/">irker IRC bot</a>.</p>
<p>IRC notifications using webhooks, implemented with the <a href="http://www.catb.org/esr/irker/">irker IRC bot</a>.</p>
<a href="https://gitlab.com/anarcat/irklab">Repository on gitlab.com</a>
</div>
</div>
......@@ -568,7 +568,7 @@ An iOS app for managing your GitLab projects on iPhone or iPad. GitLab Control g
<h4>Kanboard</h4>
<p>A free, open source and self-hosted visual task board software.
GitLab events can be connected to Kanboard's automatic actions through
<a href="http://kanboard.net/documentation/gitlab-webhooks">GitLab web hooks</a> and <a href="http://kanboard.net/documentation/gitlab-authentication">GitLab authentication</a>.</p>
<a href="http://kanboard.net/documentation/gitlab-webhooks">GitLab webhooks</a> and <a href="http://kanboard.net/documentation/gitlab-authentication">GitLab authentication</a>.</p>
<a href="http://kanboard.net">kanboard.net</a>
</div>
</div>
......
......@@ -28,7 +28,7 @@ extra_css:
<div class="heading">
<h1>GitLab compared to other tools</h1>
<p class="note-on-content">
Since GitLab people wrote them the comparisons here might be biased.
Since GitLab loyalists wrote them, the comparisons here might be biased.
Nonetheless we try hard to ensure the comparisons are fair and factual.
If you find something that is invalid, biased or out of date in the comparisons,
please open a
......
......@@ -38,44 +38,9 @@ Also the list below not include any contributions from outside GitLab the compan
The bullets list the tentpole features; the most important features of upcoming releases.
The CE and EE to the right of the version number link to all planned issues for that version.
### 8.6 [CE](https://gitlab.com/gitlab-org/gitlab-ce/milestones/22) [EE](https://gitlab.com/gitlab-org/gitlab-ee/milestones/8) March 22nd
- [GitLab Deploy](https://gitlab.com/gitlab-org/gitlab-ce/issues/3286)
- [Project import / export](https://gitlab.com/gitlab-org/gitlab-ce/issues/3050)
- [External users](https://gitlab.com/gitlab-org/gitlab-ce/issues/4009)
- [Push to a remote repository (EE)](https://gitlab.com/gitlab-org/gitlab-ee/issues/116)
- [Confidential issues (EE)](https://gitlab.com/gitlab-org/gitlab-ce/issues/3678)
- [Merge even if master is updated](https://gitlab.com/gitlab-org/gitlab-ce/issues/3873)
- [Acknowledge line comments on a MR](https://gitlab.com/gitlab-org/gitlab-ce/issues/10325)
- [Ability to delete issues](https://gitlab.com/gitlab-org/gitlab-ce/issues/2489)
- [Get rid of default login credentials](https://gitlab.com/gitlab-org/gitlab-ce/issues/1980)
- [HA Omnibus packages (EE option?)](https://gitlab.com/gitlab-org/gitlab-ee/issues/77)
- [Due date for issues](https://gitlab.com/gitlab-org/gitlab-ce/issues/12709)
- [Subscribe to a Label](https://gitlab.com/gitlab-org/gitlab-ce/issues/12743)
- [Move issues between projects](https://gitlab.com/gitlab-org/gitlab-ce/issues/3024)
### 8.7 [CE](https://gitlab.com/gitlab-org/gitlab-ce/milestones/23) [EE](https://gitlab.com/gitlab-org/gitlab-ee/milestones/9) April 22nd
- [CI Pipeline](https://gitlab.com/gitlab-org/gitlab-ce/issues/3743)
- [Squash commits upon Merging (EE)](https://gitlab.com/gitlab-org/gitlab-ee/issues/150)
- [Run build on merged code before merging (EE?)](https://gitlab.com/gitlab-org/gitlab-ce/issues/4176)
- [Code management analytics (EE option?)](https://gitlab.com/gitlab-org/gitlab-ee/issues/112)
- [Delivery analytics (EE option?)](https://gitlab.com/gitlab-org/gitlab-ee/issues/110)
- [Subscribe to new Issues](https://gitlab.com/gitlab-org/gitlab-ce/issues/12758)
- [Performance monitoring (EE)](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1008)
- [Request access to a repo](https://gitlab.com/gitlab-org/gitlab-ce/issues/13948)
- [Award emoji in comments](https://gitlab.com/gitlab-org/gitlab-ce/issues/3655)
- [Comment on Images in Diffs](https://gitlab.com/gitlab-org/gitlab-ce/issues/2641)
- [LICENSE templates](https://gitlab.com/gitlab-org/gitlab-ce/issues/12804)
### 8.8 [CE](https://gitlab.com/gitlab-org/gitlab-ce/milestones/24) [EE](https://gitlab.com/gitlab-org/gitlab-ee/milestones/10)
- [Multiline comments](https://gitlab.com/gitlab-org/gitlab-ce/issues/4143)
- [Mailing list functionality](https://gitlab.com/gitlab-org/gitlab-ce/issues/4272)
- [.gitignore templates](https://gitlab.com/gitlab-org/gitlab-ce/issues/14106)
- [Watch projects I'm not a member of](https://gitlab.com/gitlab-org/gitlab-ce/issues/9013) which is dependent on [participants table](https://gitlab.com/gitlab-org/gitlab-ce/issues/3965)
- [Use votes for acceptance of MRs](https://gitlab.com/gitlab-org/gitlab-ce/issues/13411)
<!-- direction_issues -->
<!-- do not remove or modify these lines -->
## Wishlist
......
This diff is collapsed.
......@@ -198,6 +198,8 @@ platforms:
<div class="tab-step">
<p>
<i class="glyphicons-circle_info green"></i> For configuration and troubleshooting options please see the <a class="green" href="http://doc.gitlab.com/omnibus/">Omnibus GitLab documentation</a>
<br />
<i class="glyphicons-circle_info green"></i> If you are located in China, try using <a class="green" href="https://mirror.tuna.tsinghua.edu.cn/help/gitlab-ce/">the GitLab CE mirror hosted by TUNA</a>
</p>
</div>
<div class="tab-step">
......
......@@ -31,6 +31,7 @@ Please search for similar proposals before posting your own.
* [GitLab Community Forum](https://forum.gitlab.com/): this is the best place to have a discussion.
## Reference
* [GitLab University](https://about.gitlab.com/university/) contains a variety of resources.
* [GitLab CE documentation](http://doc.gitlab.com/ce/): information about the functionality in GitLab for users, administrators and developers.
* [GitLab documentation](https://about.gitlab.com/documentation/) contails links to documentation for all GitLab applications
* [The GitLab Cookbook](https://www.packtpub.com/application-development/gitlab-cookbook): written by core team member Jeroen van Baarsen, it is the most comprehensive book about GitLab.
......
......@@ -38,7 +38,7 @@ title: GitLab Community Edition features
<li class="list-group-item">Http(s) and ssh git access</li>
<li class="list-group-item">LDAP user authentication (also compatible with Active Directory)</li>
<li class="list-group-item">Single Sign On (SSO) support via <a href="https://github.com/intridea/omniauth/wiki/List-of-Strategies#developer-strategies">Omniauth strategies</a></li>
<li class="list-group-item">Web hooks</li>
<li class="list-group-item">Webhooks</li>
<li class="list-group-item">Convenient backups</li>
<li class="list-group-item">Administrative interface</li>
<li class="list-group-item">Web based editor</li>
......
......@@ -39,6 +39,11 @@ NOTE: Our contractor agreements and employment contracts are all on the [Contrac
that it covers is over. For example, an invoice covering the period of March 1-31 can be sent on March 25.
* All invoices are internally reviewed, approved, and then payment is processed.
This is usually a fast process, but be aware that it can incur delays around vacations.
1. Any changes to a Contributor's status, classification, promotion/demotion,
pay increases/decreases, and bonus need to be communicated to People Operations
by the manager or CEO. People Operations then records this formally (for audit purposes)
in a Contributor Action Notice (CAN).
## Specific to employees based in the Netherlands <a name="nl-specific-benefits"></a>
......
......@@ -90,7 +90,7 @@ time on this, as competitors offer pretty much the same functionality.
1. Share with group feature
1. Deploy keys
* Quickly.
1. Web hooks
1. Webhooks
* Quickly.