<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/features/steps/project, branch parallel-diff-alignment</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 'ci-commit-as-pipeline' into 'master'</title>
<updated>2016-04-21T08:10:37+00:00</updated>
<author>
<name>Kamil Trzciński</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-04-21T08:10:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d2406668003f610139b60c036bc6fd9be982a580'/>
<id>d2406668003f610139b60c036bc6fd9be982a580</id>
<content type='text'>

Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -&gt; TriggerRequest -&gt; Build` to `Trigger -&gt; Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -&gt; Pipeline
Ci::Build -&gt; Build
CommitStatus -&gt; Job
GenericCommitStatus -&gt; ExternalJob

ci_commits -&gt; pipelines
ci_builds -&gt; jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -&gt; TriggerRequest -&gt; Build` to `Trigger -&gt; Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -&gt; Pipeline
Ci::Build -&gt; Build
CommitStatus -&gt; Job
GenericCommitStatus -&gt; ExternalJob

ci_commits -&gt; pipelines
ci_builds -&gt; jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'multi-filter-labels' into 'master'</title>
<updated>2016-04-20T19:18:32+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-04-20T19:18:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=692c35e6f499598d0c6f91eb83ca8837ca93e07f'/>
<id>692c35e6f499598d0c6f91eb83ca8837ca93e07f</id>
<content type='text'>

Mutliple label filter

Fixes #989 

See merge request !3438</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Mutliple label filter

Fixes #989 

See merge request !3438</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'license-templates-and-api-12804' into 'master'</title>
<updated>2016-04-20T01:38:49+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-04-20T01:38:49+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3d4875f86a3b23789f5ea801c096754fced25166'/>
<id>3d4875f86a3b23789f5ea801c096754fced25166</id>
<content type='text'>

License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'mr-formatting' into 'master'</title>
<updated>2016-04-19T16:23:41+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-04-19T16:23:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7b09bab68e0ccc4990218ee91211577d4d109703'/>
<id>7b09bab68e0ccc4990218ee91211577d4d109703</id>
<content type='text'>

use ! rather than # for merge request references

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278

See merge request !3740</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

use ! rather than # for merge request references

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278

See merge request !3740</pre>
</div>
</content>
</entry>
<entry>
<title>format merge request references properly</title>
<updated>2016-04-19T06:32:02+00:00</updated>
<author>
<name>Ben Bodenmiller</name>
<email>bbodenmiller@hotmail.com</email>
</author>
<published>2016-04-19T06:32:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b68e3925ffac4e8ffa376e25786c5dcaa915d75a'/>
<id>b68e3925ffac4e8ffa376e25786c5dcaa915d75a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix specs</title>
<updated>2016-04-18T12:47:50+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-04-13T15:00:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b2370fefad16b6b0a808a75b9a7b1d1613187693'/>
<id>b2370fefad16b6b0a808a75b9a7b1d1613187693</id>
<content type='text'>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix features specs (hopefully)</title>
<updated>2016-04-18T12:47:50+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-04-12T14:56:18+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0aaaae9d0536c5637662f6c72a6612ec13f0342f'/>
<id>0aaaae9d0536c5637662f6c72a6612ec13f0342f</id>
<content type='text'>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove persistent XSS vulnerability in `commit_person_link` helper</title>
<updated>2016-04-17T22:42:49+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-04-17T21:48:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7cc239528ea7f4905e6d773771006ec661d628d6'/>
<id>7cc239528ea7f4905e6d773771006ec661d628d6</id>
<content type='text'>
Because we were incorrectly supplying the tooltip title as
`data-original-title` (which Bootstrap's Tooltip JS automatically
applies based on the `title` attribute; we should never be setting it
directly), the value was being passed through as-is.

Instead, we should be supplying the normal `title` attribute and letting
Rails escape the value, which also negates the need for us to call
`sanitize` on it.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Because we were incorrectly supplying the tooltip title as
`data-original-title` (which Bootstrap's Tooltip JS automatically
applies based on the `title` attribute; we should never be setting it
directly), the value was being passed through as-is.

Instead, we should be supplying the normal `title` attribute and letting
Rails escape the value, which also negates the need for us to call
`sanitize` on it.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline</title>
<updated>2016-04-16T17:55:14+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-04-16T17:55:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=065e0c0fe4e5e16b90c01736721e4c794b71dac9'/>
<id>065e0c0fe4e5e16b90c01736721e4c794b71dac9</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>fix failing tests</title>
<updated>2016-04-14T10:16:24+00:00</updated>
<author>
<name>Arinde Eniola</name>
<email>eniolaarinde1@gmail.com</email>
</author>
<published>2016-04-14T10:16:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5f53ca69ace953bf06afe478072836d083f941ca'/>
<id>5f53ca69ace953bf06afe478072836d083f941ca</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
