<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/db, branch tests-for-diff-notes</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>Merge branch 'fix-diff-note-discussion-id' into 'master'</title>
<updated>2016-08-20T00:01:49+00:00</updated>
<author>
<name>Rubén Dávila Santos</name>
<email>ruben@gitlab.com</email>
</author>
<published>2016-08-20T00:01:49+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0d62f283d6df79b75cdbbf79cce4b8aad9cbc778'/>
<id>0d62f283d6df79b75cdbbf79cce4b8aad9cbc778</id>
<content type='text'>

Call `set_discussion_id` again in DiffNote `before_validation` because the order is important



See merge request !5913</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Call `set_discussion_id` again in DiffNote `before_validation` because the order is important



See merge request !5913</pre>
</div>
</content>
</entry>
<entry>
<title>Call `set_discussion_id` again in DiffNote `before_validation` because the order is important</title>
<updated>2016-08-19T23:24:12+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-08-19T22:22:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d741303a5992b0d259a125baa62b66ca4df209da'/>
<id>d741303a5992b0d259a125baa62b66ca4df209da</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Support integration with Koding (online IDE)</title>
<updated>2016-08-19T19:10:58+00:00</updated>
<author>
<name>Gokmen Goksel</name>
<email>gokmen@goksel.me</email>
</author>
<published>2016-07-26T03:59:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a927a9bf6baa99be94181c3ab980947621ae2fe0'/>
<id>a927a9bf6baa99be94181c3ab980947621ae2fe0</id>
<content type='text'>
Koding: #index: landing page for Koding integration

If enabled it will provide a link to open remote Koding instance url
for now we are also providing the sneak preview video for how
integration works in detail.

Repository: check whether .koding.yml file exists on repository

Projects: landing page: show Run in IDE (Koding) button if repo has stack file

Projects: MR: show Run in IDE Koding button if repo has stack file on active branch

ProjectHelpers: add_koding_stack: stack generator for provided project

With this helper we will auto-generate the required stack template
for a given project. For the feature we can request this base template
from the running Koding instance on integration.

Currently this will provide users to create a t2.nano instance on aws
and it'll automatically configures the instance for basic requirements.

Projects: empty state and landing page provide shortcuts to create stack

projects_helper: use branch on checkout and provide an entry point

This ${var.koding_queryString_branch} will be replaced with the branch
provided in query string which will allow us to use same stack template
for different branches of the same repository.

ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b

projects_helper: provide sha info in query string to use existing vms

With this change we'll be able to query existing vms on Koding side
based on the commit id that they've created.

ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343

Integration: Docs: Koding documentation added

Disable /koding route if integration is disabled

Use application settings to enable Koding

Projects_helper: better indentation with strip_heredoc usage

Projects_helper: return koding_url as is if there is no project provided

current_settings: set koding_enabled: false by default

Koding_Controller: to render not_found once integration is disabled

Dashboard_specs: update spec for Koding enabled case

Projects_Helper: make repo dynamic

ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c

Updated documentation to have right format
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Koding: #index: landing page for Koding integration

If enabled it will provide a link to open remote Koding instance url
for now we are also providing the sneak preview video for how
integration works in detail.

Repository: check whether .koding.yml file exists on repository

Projects: landing page: show Run in IDE (Koding) button if repo has stack file

Projects: MR: show Run in IDE Koding button if repo has stack file on active branch

ProjectHelpers: add_koding_stack: stack generator for provided project

With this helper we will auto-generate the required stack template
for a given project. For the feature we can request this base template
from the running Koding instance on integration.

Currently this will provide users to create a t2.nano instance on aws
and it'll automatically configures the instance for basic requirements.

Projects: empty state and landing page provide shortcuts to create stack

projects_helper: use branch on checkout and provide an entry point

This ${var.koding_queryString_branch} will be replaced with the branch
provided in query string which will allow us to use same stack template
for different branches of the same repository.

ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b

projects_helper: provide sha info in query string to use existing vms

With this change we'll be able to query existing vms on Koding side
based on the commit id that they've created.

ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343

Integration: Docs: Koding documentation added

Disable /koding route if integration is disabled

Use application settings to enable Koding

Projects_helper: better indentation with strip_heredoc usage

Projects_helper: return koding_url as is if there is no project provided

current_settings: set koding_enabled: false by default

Koding_Controller: to render not_found once integration is disabled

Dashboard_specs: update spec for Koding enabled case

Projects_Helper: make repo dynamic

ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c

Updated documentation to have right format
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'expiration-date-on-memberships' into 'master'</title>
<updated>2016-08-19T17:08:03+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-08-19T17:08:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=725036669cca45df17f1acbb1a45a031a1a84c85'/>
<id>725036669cca45df17f1acbb1a45a031a1a84c85</id>
<content type='text'>

Expiration date on memberships

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495

See merge request !5876</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Expiration date on memberships

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495

See merge request !5876</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/pipeline-seeds-in-dev-env' into 'master'</title>
<updated>2016-08-19T15:49:19+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-08-19T15:49:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=937d770afed850ef49719578551f45fbc18347dc'/>
<id>937d770afed850ef49719578551f45fbc18347dc</id>
<content type='text'>

Improve pipeline fixtures in development environment

### What does this MR do?

This MR adds further improvements to seeds for development environment:

* fixes build artifacts fixtures
* fixes build log fixtures
* moves unsuccessful jobs to the last triggered stage

See merge request !5838</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Improve pipeline fixtures in development environment

### What does this MR do?

This MR adds further improvements to seeds for development environment:

* fixes build artifacts fixtures
* fixes build log fixtures
* moves unsuccessful jobs to the last triggered stage

See merge request !5838</pre>
</div>
</content>
</entry>
<entry>
<title>Move and improvement comment in pipeline fixtures</title>
<updated>2016-08-19T12:43:02+00:00</updated>
<author>
<name>Grzegorz Bizon</name>
<email>grzesiek.bizon@gmail.com</email>
</author>
<published>2016-08-19T12:43:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c15dc455f12a37713b82a9a2f1e1017d6fbfac5f'/>
<id>c15dc455f12a37713b82a9a2f1e1017d6fbfac5f</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 'master' into 'expiration-date-on-memberships'</title>
<updated>2016-08-19T10:58:01+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-08-19T10:58:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=07f34709fcd2502963037c5f7f7adb8ec32dfc7b'/>
<id>07f34709fcd2502963037c5f7f7adb8ec32dfc7b</id>
<content type='text'>
# Conflicts:
#   db/schema.rb</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#   db/schema.rb</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into expiration-date-on-memberships</title>
<updated>2016-08-18T21:50:28+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-08-18T21:50:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aba9cc6f227a670390cbac0c5da97784afefc5ee'/>
<id>aba9cc6f227a670390cbac0c5da97784afefc5ee</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Allow project group links to be expired</title>
<updated>2016-08-18T21:45:41+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-08-18T21:45:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=883b96ab6a77175d9bac7f03c325428327359cdd'/>
<id>883b96ab6a77175d9bac7f03c325428327359cdd</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 'master' into diff-line-comment-vuejs</title>
<updated>2016-08-18T21:43:26+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-08-18T21:43:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8b05e8c2d10f78467db8bec140950104eba49e92'/>
<id>8b05e8c2d10f78467db8bec140950104eba49e92</id>
<content type='text'>
# Conflicts:
#	db/schema.rb
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	db/schema.rb
</pre>
</div>
</content>
</entry>
</feed>
