<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch grapify-todos-api</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Grapify todos API</title>
<updated>2016-10-14T07:22:50+00:00</updated>
<author>
<name>Robert Schilling</name>
<email>rschilling@student.tugraz.at</email>
</author>
<published>2016-10-14T07:16:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b927473c45e42e99adbbe69b71653f1b2981df01'/>
<id>b927473c45e42e99adbbe69b71653f1b2981df01</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-loosen-request_store' into 'master'</title>
<updated>2016-10-13T14:22:53+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-10-13T14:22:53+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4b889dbb3cbe0eb3ab639ca68bbe6e71abec711c'/>
<id>4b889dbb3cbe0eb3ab639ca68bbe6e71abec711c</id>
<content type='text'>

Loosen requirement on request_store version

This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868

See merge request !6853</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Loosen requirement on request_store version

This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868

See merge request !6853</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'feature/issues-board' into 'master'</title>
<updated>2016-10-13T14:21:14+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-10-13T14:21:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=11e93ad59d6209bf9805a6f7053719e8052cc508'/>
<id>11e93ad59d6209bf9805a6f7053719e8052cc508</id>
<content type='text'>

Refactoring Issues Board

## What does this MR do?

This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

To avoid a lot of conflicts with EE multiple boards feature.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [x] API support added
- Tests
  - [X] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ee/issues/929

https://gitlab.com/gitlab-org/gitlab-ee/issues/1084

See merge request !6727</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Refactoring Issues Board

## What does this MR do?

This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

To avoid a lot of conflicts with EE multiple boards feature.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [x] API support added
- Tests
  - [X] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ee/issues/929

https://gitlab.com/gitlab-org/gitlab-ee/issues/1084

See merge request !6727</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'bug/rst-forked-gem' into 'master'</title>
<updated>2016-10-13T13:54:54+00:00</updated>
<author>
<name>Marin Jankovski</name>
<email>marin@gitlab.com</email>
</author>
<published>2016-10-13T13:54:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=36dafbbb02201ad36ca7e59f699cbf727494129e'/>
<id>36dafbbb02201ad36ca7e59f699cbf727494129e</id>
<content type='text'>

Use forked github-markup gem to enable python3 support with omnibus

## What does this MR do?
Changes the version of `github-markup` gem we are using, to be the forked one with the changes to enable python3 support.
The change is backward compatible with users using Python 2, and will only be running with Python 3 in Omnibus (with the help of a custom patch we apply there).

## Are there points in the code the reviewer needs to double check?
Make sure backward compatibility isn't broken for source installs.

## For the release manager

You need to make sure you pickup into stable this merge request as well (for omnibus): https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1015 as it's part of the fix, otherwise package will fail to build.

## Why was this MR needed?
We had some regressions with .rst rendering that were fixed, but still some issues with encoding persisted (this MR will fix that). See: https://gitlab.com/gitlab-org/gitlab-ce/issues/21696

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

* gitlab-org/gitlab-ce#21696
* gitlab-org/gitlab-ce#22748
* gitlab-com/support-forum#1097

See merge request !6659</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Use forked github-markup gem to enable python3 support with omnibus

## What does this MR do?
Changes the version of `github-markup` gem we are using, to be the forked one with the changes to enable python3 support.
The change is backward compatible with users using Python 2, and will only be running with Python 3 in Omnibus (with the help of a custom patch we apply there).

## Are there points in the code the reviewer needs to double check?
Make sure backward compatibility isn't broken for source installs.

## For the release manager

You need to make sure you pickup into stable this merge request as well (for omnibus): https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1015 as it's part of the fix, otherwise package will fail to build.

## Why was this MR needed?
We had some regressions with .rst rendering that were fixed, but still some issues with encoding persisted (this MR will fix that). See: https://gitlab.com/gitlab-org/gitlab-ce/issues/21696

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

* gitlab-org/gitlab-ce#21696
* gitlab-org/gitlab-ce#22748
* gitlab-com/support-forum#1097

See merge request !6659</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'zj-grapedsl-variable' into 'master'</title>
<updated>2016-10-13T13:38:02+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-10-13T13:38:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8fe2e345d704ba76aa9d845d280365ed8855a6e5'/>
<id>8fe2e345d704ba76aa9d845d280365ed8855a6e5</id>
<content type='text'>

GrapeDSL for variables



See merge request !6838</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

GrapeDSL for variables



See merge request !6838</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '23234-deleting-a-milestone-removes-source-branch-deletion-options-of-associated-merge-requests' into 'master'</title>
<updated>2016-10-13T13:19:56+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-10-13T13:19:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b3e989b057ff9cd1973f0927b4b0f0d28b1e0c6b'/>
<id>b3e989b057ff9cd1973f0927b4b0f0d28b1e0c6b</id>
<content type='text'>

Maintain "force_remove_source_branch" options on Merge Request unless specified

## What does this MR do?

Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge

* Closes #23234 
* Closes #23191
* Closes #19351

See merge request !6817</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Maintain "force_remove_source_branch" options on Merge Request unless specified

## What does this MR do?

Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge

* Closes #23234 
* Closes #23191
* Closes #19351

See merge request !6817</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'cache-gems-for-tags' into 'master'</title>
<updated>2016-10-13T13:02:11+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-10-13T13:02:11+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2362dfee686ab715ef6a3bd00b389ab321e7a728'/>
<id>2362dfee686ab715ef6a3bd00b389ab321e7a728</id>
<content type='text'>

Keep a copy of gems needed by our releases as CI artifacts

This is meant as insurance in case a gem GitLab needs is ever removed
from rubygems.org. After we merge this, all future GitLab tags will
have a CI artifact archive containing all the gems (for all platforms)
specified in Gemfile.lock for that revision.

Only runs on tags (so we don't constantly create 50MB gem cache bundles).

See merge request !6617</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Keep a copy of gems needed by our releases as CI artifacts

This is meant as insurance in case a gem GitLab needs is ever removed
from rubygems.org. After we merge this, all future GitLab tags will
have a CI artifact archive containing all the gems (for all platforms)
specified in Gemfile.lock for that revision.

Only runs on tags (so we don't constantly create 50MB gem cache bundles).

See merge request !6617</pre>
</div>
</content>
</entry>
<entry>
<title>Loosen requirement on request_store version</title>
<updated>2016-10-13T13:02:05+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-10-13T13:02:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2709f679d07a5fc08f5cc31a416e00e61a04d2c1'/>
<id>2709f679d07a5fc08f5cc31a416e00e61a04d2c1</id>
<content type='text'>
This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'trigger-docs' into 'master'</title>
<updated>2016-10-13T12:44:56+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-10-13T12:44:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6d48c489d93d6dcbdfd955b7456d97ba6cdb23d1'/>
<id>6d48c489d93d6dcbdfd955b7456d97ba6cdb23d1</id>
<content type='text'>

Add job to trigger a docs.gitlab.com build

## What does this MR do?

Add a job to build the docs site every time master tests pass.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-com/doc-gitlab-com/issues/56

See merge request !6850</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add job to trigger a docs.gitlab.com build

## What does this MR do?

Add a job to build the docs site every time master tests pass.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-com/doc-gitlab-com/issues/56

See merge request !6850</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'feature/cycle-analytics-2-backend' into 'master'</title>
<updated>2016-10-13T12:31:24+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-10-13T12:31:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d3a48fec53cb6f3422c7aaa3ada9da1c7944c41d'/>
<id>d3a48fec53cb6f3422c7aaa3ada9da1c7944c41d</id>
<content type='text'>

Implement second iteration of cycle analytics - Change in data measurement

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/22458

Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages.

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !6798</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Implement second iteration of cycle analytics - Change in data measurement

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/22458

Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages.

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !6798</pre>
</div>
</content>
</entry>
</feed>
