<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch cs-remove-inline-js</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>Make sure Labels is instantiated on edit page</title>
<updated>2016-07-27T08:24:11+00:00</updated>
<author>
<name>Alfredo Sumaran</name>
<email>alfredo@gitlab.com</email>
</author>
<published>2016-07-27T08:24:11+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8f3e3f6b8070d6887f0d267fcaea89579d909287'/>
<id>8f3e3f6b8070d6887f0d267fcaea89579d909287</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Removes two simple instances of inline JavaScript.</title>
<updated>2016-07-26T22:59:55+00:00</updated>
<author>
<name>Connor Shea</name>
<email>connor.james.shea@gmail.com</email>
</author>
<published>2016-07-26T22:59:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=df0a77a7bed7c860793e027421a3fafeb12646df'/>
<id>df0a77a7bed7c860793e027421a3fafeb12646df</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 'feature/profile-requests-conditionally' into 'master'</title>
<updated>2016-07-26T22:07:15+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-07-26T22:07:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=95efb6f1163b7c2c40d03ddd834016905fc45b50'/>
<id>95efb6f1163b7c2c40d03ddd834016905fc45b50</id>
<content type='text'>

Return request profiling info when a header is passed

## What does this MR do?
It allows returning profiling info (instead of actual content) when a certain header is passed

## Why was this MR needed?
To facilitate having a performance overview of certain requests.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-com/infrastructure/issues/211

## 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~~
  - [ ] ~~Added for this feature/bug~~
  - [ ] ~~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)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5281</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Return request profiling info when a header is passed

## What does this MR do?
It allows returning profiling info (instead of actual content) when a certain header is passed

## Why was this MR needed?
To facilitate having a performance overview of certain requests.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-com/infrastructure/issues/211

## 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~~
  - [ ] ~~Added for this feature/bug~~
  - [ ] ~~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)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5281</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '20302-forking-a-project-from-one-storage-to-another-fails' into 'master'</title>
<updated>2016-07-26T22:03:41+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-07-26T22:03:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=74e17ed9eda95646d8defd495962be9dd3771eac'/>
<id>74e17ed9eda95646d8defd495962be9dd3771eac</id>
<content type='text'>

Fix a bug where forking a project from a repository storage to another would fail

## What does this MR do?

Fix a bug where forking a project from a repository storage to another would fail.

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

If you have a project in storage_a, change the default storage to storage_b, and attempt to fork said project, the import will fail.

## What are the relevant issue numbers?

Closes #20302 

- [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
  - [ ] All builds are passing
- [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)
- [ ] Merge https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/75, publish the tag, and update `GITLAB_SHELL_VERSION`


See merge request !5509</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix a bug where forking a project from a repository storage to another would fail

## What does this MR do?

Fix a bug where forking a project from a repository storage to another would fail.

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

If you have a project in storage_a, change the default storage to storage_b, and attempt to fork said project, the import will fail.

## What are the relevant issue numbers?

Closes #20302 

- [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
  - [ ] All builds are passing
- [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)
- [ ] Merge https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/75, publish the tag, and update `GITLAB_SHELL_VERSION`


See merge request !5509</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'cs-rm-inline-js-import' into 'master'</title>
<updated>2016-07-26T21:34:14+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-26T21:34:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a93994691c8adbd74df29a774b6fbb0d026425c0'/>
<id>a93994691c8adbd74df29a774b6fbb0d026425c0</id>
<content type='text'>

Remove inline scripts from import pages.

## What does this MR do?

Removes inline scripts from the Import Status pages for all the importers we have.

## Are there points in the code the reviewer needs to double check?

That this doesn't break anything (it didn't when I tested it!)

## Why was this MR needed?

Inline scripts are bad, this removes a few of them.

## What are the relevant issue numbers?

#18231 and #19866

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] 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)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5283</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Remove inline scripts from import pages.

## What does this MR do?

Removes inline scripts from the Import Status pages for all the importers we have.

## Are there points in the code the reviewer needs to double check?

That this doesn't break anything (it didn't when I tested it!)

## Why was this MR needed?

Inline scripts are bad, this removes a few of them.

## What are the relevant issue numbers?

#18231 and #19866

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] 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)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5283</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'sortable-branches-push-permission' into 'master'</title>
<updated>2016-07-26T21:28:51+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-26T21:28:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=39ed6290efc31ec99c28addd3f15f2e5eb20c1cd'/>
<id>39ed6290efc31ec99c28addd3f15f2e5eb20c1cd</id>
<content type='text'>

Make branches sortable without push permission

## What does this MR do?

Make branches on the branches page sortable without push permission.

## Why was this MR needed?

Sorting branches (a readonly action) required push permission which does not make sense.

## What are the relevant issue numbers?

fixes #18678

## Screenshots

### Before

![before](/uploads/d77d0be2599481b815cb2ef1f9c33a15/before.png)

### After

![after](/uploads/edbcf9d5ec4b2650866742ead0c2c1ed/after.png)


See merge request !5462</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Make branches sortable without push permission

## What does this MR do?

Make branches on the branches page sortable without push permission.

## Why was this MR needed?

Sorting branches (a readonly action) required push permission which does not make sense.

## What are the relevant issue numbers?

fixes #18678

## Screenshots

### Before

![before](/uploads/d77d0be2599481b815cb2ef1f9c33a15/before.png)

### After

![after](/uploads/edbcf9d5ec4b2650866742ead0c2c1ed/after.png)


See merge request !5462</pre>
</div>
</content>
</entry>
<entry>
<title>Whitelist 'Simplified BSD' license</title>
<updated>2016-07-26T21:25:15+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-07-26T21:25:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ef8d9c269a8383ba2e3766b13b44b655e0588609'/>
<id>ef8d9c269a8383ba2e3766b13b44b655e0588609</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix a bug where forking a project from a repository storage to another would fail</title>
<updated>2016-07-26T21:22:13+00:00</updated>
<author>
<name>Alejandro Rodríguez</name>
<email>alejorro70@gmail.com</email>
</author>
<published>2016-07-26T21:22:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1dcfb1d3a7b6b8002b1f25e8cf463617acbc1299'/>
<id>1dcfb1d3a7b6b8002b1f25e8cf463617acbc1299</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove inline scripts from import pages.</title>
<updated>2016-07-26T20:58:01+00:00</updated>
<author>
<name>Connor Shea</name>
<email>connor.james.shea@gmail.com</email>
</author>
<published>2016-07-15T16:20:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=92cd19709b5abb3af8852c496ce65adc85e94043'/>
<id>92cd19709b5abb3af8852c496ce65adc85e94043</id>
<content type='text'>
Instead add data attributes to a JS hook element on every import status page.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Instead add data attributes to a JS hook element on every import status page.
</pre>
</div>
</content>
</entry>
<entry>
<title>Make branches sortable without push permission (!5462)</title>
<updated>2016-07-26T20:49:32+00:00</updated>
<author>
<name>winniehell</name>
<email>git@winniehell.de</email>
</author>
<published>2016-07-24T20:13:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=21209a87df975deec3f1184c7622df7b57ad1e13'/>
<id>21209a87df975deec3f1184c7622df7b57ad1e13</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
