<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/features/projects, branch rc-document-preferred-array-syntax</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 'branches-mr-button-permissions' into 'master'</title>
<updated>2016-09-09T18:31:46+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-09-09T18:31:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=333cb57363ddbc70620759c63cabeef5e909f8ce'/>
<id>333cb57363ddbc70620759c63cabeef5e909f8ce</id>
<content type='text'>

Hides merge request button on branches page

## What does this MR do?

 If user does not have the correct permissions, the merge request button is hidden

## What are the relevant issue numbers?

Closes #21805

See merge request !6181</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Hides merge request button on branches page

## What does this MR do?

 If user does not have the correct permissions, the merge request button is hidden

## What are the relevant issue numbers?

Closes #21805

See merge request !6181</pre>
</div>
</content>
</entry>
<entry>
<title>improve code after review</title>
<updated>2016-09-06T12:42:43+00:00</updated>
<author>
<name>ubudzisz</name>
<email>ubudzisz@gmail.com</email>
</author>
<published>2016-09-06T09:49:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=790d7cce968260b28e451483606c44ec340f6d80'/>
<id>790d7cce968260b28e451483606c44ec340f6d80</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>add feature test</title>
<updated>2016-09-06T12:42:43+00:00</updated>
<author>
<name>ubudzisz</name>
<email>ubudzisz@gmail.com</email>
</author>
<published>2016-08-30T15:37:49+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=691644dc5be544af0b0793353ab7f151136f1198'/>
<id>691644dc5be544af0b0793353ab7f151136f1198</id>
<content type='text'>
add feature test

add feature test

add feature test

remove test to builds_spec

remove feature test to builds_spec

remove feature test to builds_spec

add changes to methods and remove FactoryGirl

add changes to methods and remove FactoryGirl

adding changes to test and js file

changes grammar

update changelog

rename file name

update files after review

update files after review

update files after review
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
add feature test

add feature test

add feature test

remove test to builds_spec

remove feature test to builds_spec

remove feature test to builds_spec

add changes to methods and remove FactoryGirl

add changes to methods and remove FactoryGirl

adding changes to test and js file

changes grammar

update changelog

rename file name

update files after review

update files after review

update files after review
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'project-edit-features-hide' into 'master'</title>
<updated>2016-09-02T18:29:17+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-09-02T18:29:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0013988666a59150fa3832390c6404bc8324afe1'/>
<id>0013988666a59150fa3832390c6404bc8324afe1</id>
<content type='text'>

Hides merge request section in edit project when disabled

## What does this MR do?

Correctly hides the merge request section in the project edit page when disabled. It used to work before the feature visibility part was changed to dropdown - so added a test to prevent in future! :thumbsup: 

## Screenshots (if relevant)

![hide](/uploads/eb72ef87bad19c2716472a0c1031fd32/hide.gif)

See merge request !6175</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Hides merge request section in edit project when disabled

## What does this MR do?

Correctly hides the merge request section in the project edit page when disabled. It used to work before the feature visibility part was changed to dropdown - so added a test to prevent in future! :thumbsup: 

## Screenshots (if relevant)

![hide](/uploads/eb72ef87bad19c2716472a0c1031fd32/hide.gif)

See merge request !6175</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/handle-raw-trace-error-on-old-builds' into 'master'</title>
<updated>2016-09-02T14:31:46+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-09-02T14:31:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ece30b70ca3545e396963974aa0f27f37512bf97'/>
<id>ece30b70ca3545e396963974aa0f27f37512bf97</id>
<content type='text'>

Handle error on trace raw download with old builds (DB stored)

## What does this MR do?

Handles error on `raw build trace` download action for old builds (which are stored in DB instead of file).

## Are there points in the code the reviewer needs to double check?

No.

## Why was this MR needed?

At the beginning build traces were stored in database but at some point we moved to store them in files. All trace related actions are aware of this, but not `raw trace download`.

## What are the relevant issue numbers?

Fixes #18900

## Does this MR meet the acceptance criteria?


- [x] [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
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [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 you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4822</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Handle error on trace raw download with old builds (DB stored)

## What does this MR do?

Handles error on `raw build trace` download action for old builds (which are stored in DB instead of file).

## Are there points in the code the reviewer needs to double check?

No.

## Why was this MR needed?

At the beginning build traces were stored in database but at some point we moved to store them in files. All trace related actions are aware of this, but not `raw trace download`.

## What are the relevant issue numbers?

Fixes #18900

## Does this MR meet the acceptance criteria?


- [x] [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
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [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 you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4822</pre>
</div>
</content>
</entry>
<entry>
<title>Hides merge request button on branches page</title>
<updated>2016-09-02T13:33:24+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-09-02T13:33:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=315e6392cd5f4e35fd44d0d24637ea377604b754'/>
<id>315e6392cd5f4e35fd44d0d24637ea377604b754</id>
<content type='text'>
If user does not have the correct permissions, the merge request button is hidden

Closes #21805
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
If user does not have the correct permissions, the merge request button is hidden

Closes #21805
</pre>
</div>
</content>
</entry>
<entry>
<title>Hides merge request section in edit project when disabled</title>
<updated>2016-09-02T11:03:49+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-09-02T11:03:49+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4da474ca928fff916a1e8ac3bb42d81df2364431'/>
<id>4da474ca928fff916a1e8ac3bb42d81df2364431</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Project tools visibility level</title>
<updated>2016-09-01T14:47:59+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2016-08-01T22:31:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=892dea67717c0efbd6a28f7639f34535ec0a8747'/>
<id>892dea67717c0efbd6a28f7639f34535ec0a8747</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix rubocop offences</title>
<updated>2016-09-01T12:00:47+00:00</updated>
<author>
<name>Tomasz Maczukin</name>
<email>tomasz@maczukin.pl</email>
</author>
<published>2016-08-31T17:38:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=65274b1db697c329c1e106c170a050599d65de72'/>
<id>65274b1db697c329c1e106c170a050599d65de72</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update specs - add mocks to simulate old versions</title>
<updated>2016-09-01T12:00:46+00:00</updated>
<author>
<name>Tomasz Maczukin</name>
<email>tomasz@maczukin.pl</email>
</author>
<published>2016-08-30T10:47:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c8861da76772d781f677a76506f590edc23ba251'/>
<id>c8861da76772d781f677a76506f590edc23ba251</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
