<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch document-2fa-backup</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>You need to store your DB encryption key</title>
<updated>2015-07-21T12:35:58+00:00</updated>
<author>
<name>Jacob Vosmaer</name>
<email>contact@jacobvosmaer.nl</email>
</author>
<published>2015-07-21T12:35:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=96819d2fb42b65066f4adcc5e48daf65a58449ec'/>
<id>96819d2fb42b65066f4adcc5e48daf65a58449ec</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' of github.com:gitlabhq/gitlabhq</title>
<updated>2015-07-20T11:26:36+00:00</updated>
<author>
<name>Marin Jankovski</name>
<email>maxlazio@gmail.com</email>
</author>
<published>2015-07-20T11:26:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=da039ed51c5e8755cfdc1045ecfbb5b238e8231b'/>
<id>da039ed51c5e8755cfdc1045ecfbb5b238e8231b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #9400 from tuxillo/patch-1</title>
<updated>2015-07-20T09:45:34+00:00</updated>
<author>
<name>Jacob Vosmaer</name>
<email>contact@jacobvosmaer.nl</email>
</author>
<published>2015-07-20T09:45:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=83304bf41000cc28fdc27834638b5b76fc532f62'/>
<id>83304bf41000cc28fdc27834638b5b76fc532f62</id>
<content type='text'>
Use whoami instead of $USER</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Use whoami instead of $USER</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'set-omniauth-full-host' into 'master'</title>
<updated>2015-07-20T08:45:58+00:00</updated>
<author>
<name>Marin Jankovski</name>
<email>marin@gitlab.com</email>
</author>
<published>2015-07-20T08:45:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8fa9da49c4a4d8bc58917699578ed4e59a90d162'/>
<id>8fa9da49c4a4d8bc58917699578ed4e59a90d162</id>
<content type='text'>
Set OmniAuth full_host parameter to ensure redirect URIs are correct

### What does this MR do?

This MR sets the OmniAuth `full_host` parameter to the configured GitLab URL to ensure the `redirect_uri` parameter is called with the right GitLab host.

### Why was this MR needed?

[OmniAuth attempts to grab the request URI](http://awesomeprogrammer.com/blog/2012/12/09/dealing-with-omniauth-redirect-uri-mismatch-invalid-port-number-gotcha/) and use that. If you set up a reverse proxy that terminates SSL at the Web server layer (e.g. https://gitlab.domain.com), omniauth will use the internal URL (e.g. http://my-host:8080) in its redirect URI unless all the Web server headers are properly set (e.g. `X-Forwarded-Port`, etc.). This is easy to forget or mess up, and it's better to ensure that OmniAuth has the right value from the start.

### What are the relevant issue numbers?

Closes #1967

See merge request !991
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Set OmniAuth full_host parameter to ensure redirect URIs are correct

### What does this MR do?

This MR sets the OmniAuth `full_host` parameter to the configured GitLab URL to ensure the `redirect_uri` parameter is called with the right GitLab host.

### Why was this MR needed?

[OmniAuth attempts to grab the request URI](http://awesomeprogrammer.com/blog/2012/12/09/dealing-with-omniauth-redirect-uri-mismatch-invalid-port-number-gotcha/) and use that. If you set up a reverse proxy that terminates SSL at the Web server layer (e.g. https://gitlab.domain.com), omniauth will use the internal URL (e.g. http://my-host:8080) in its redirect URI unless all the Web server headers are properly set (e.g. `X-Forwarded-Port`, etc.). This is easy to forget or mess up, and it's better to ensure that OmniAuth has the right value from the start.

### What are the relevant issue numbers?

Closes #1967

See merge request !991
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-unauthenticated-label-access' into 'master'</title>
<updated>2015-07-20T03:29:13+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2015-07-20T03:29:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e5a12596abe48504737cb8633872794aa83ccb32'/>
<id>e5a12596abe48504737cb8633872794aa83ccb32</id>
<content type='text'>
Fix label read access for unauthenticated users

The label page was added to navigation for unauthorized users because
the previously used milestone read permission was still checked. This
has been fixed and read access to labels is now granted (again) for
public projects.

This regression has been introduced in
07efb17e10fe26a01b60d8441868f9fbda0768f2 (7.12).

See also 9bcd36396b9b71467f66dd4ed79ab709bb5d027a.

Refs !836, !842.

See merge request !1000
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix label read access for unauthenticated users

The label page was added to navigation for unauthorized users because
the previously used milestone read permission was still checked. This
has been fixed and read access to labels is now granted (again) for
public projects.

This regression has been introduced in
07efb17e10fe26a01b60d8441868f9fbda0768f2 (7.12).

See also 9bcd36396b9b71467f66dd4ed79ab709bb5d027a.

Refs !836, !842.

See merge request !1000
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-issue-2001' into 'master'</title>
<updated>2015-07-19T21:27:38+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>valery@gitlab.com</email>
</author>
<published>2015-07-19T21:27:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d0ef64ac8eedae3544e700d94a2373184c9597ee'/>
<id>d0ef64ac8eedae3544e700d94a2373184c9597ee</id>
<content type='text'>

Dynamically check `:admin_*` ability in issuable context

Closes #2001

See merge request !1002</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Dynamically check `:admin_*` ability in issuable context

Closes #2001

See merge request !1002</pre>
</div>
</content>
</entry>
<entry>
<title>Dynamically check `:admin_*` ability in issuable context</title>
<updated>2015-07-19T20:48:33+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2015-07-19T20:48:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e65b08106282015955fce52e818b7431d5cb2e83'/>
<id>e65b08106282015955fce52e818b7431d5cb2e83</id>
<content type='text'>
Closes #2001
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #2001
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix label read access for unauthenticated users</title>
<updated>2015-07-19T19:33:21+00:00</updated>
<author>
<name>Daniel Gerhardt</name>
<email>code@dgerhardt.net</email>
</author>
<published>2015-07-19T18:58:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=69417d36b2fa4dfbe2205c4df1428eb17ebd061e'/>
<id>69417d36b2fa4dfbe2205c4df1428eb17ebd061e</id>
<content type='text'>
The label page was added to navigation for unauthorized users because
the previously used milestone read permission was still checked. This
has been fixed and read access to labels is now granted (again) for
public projects.

This regression has been introduced in
07efb17e10fe26a01b60d8441868f9fbda0768f2 (7.12).

See also 9bcd36396b9b71467f66dd4ed79ab709bb5d027a.

Refs !836, !842.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The label page was added to navigation for unauthorized users because
the previously used milestone read permission was still checked. This
has been fixed and read access to labels is now granted (again) for
public projects.

This regression has been introduced in
07efb17e10fe26a01b60d8441868f9fbda0768f2 (7.12).

See also 9bcd36396b9b71467f66dd4ed79ab709bb5d027a.

Refs !836, !842.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-mixed-color-preview' into 'master'</title>
<updated>2015-07-19T09:19:30+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>valery@gitlab.com</email>
</author>
<published>2015-07-19T09:19:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e8aaf5680355b2a71ab85439f653a70f4b487e0b'/>
<id>e8aaf5680355b2a71ab85439f653a70f4b487e0b</id>
<content type='text'>
Fix bug where notes were being rendered with wrong color preferences due to caching

### What does this MR do?

This MR adds the user's color preferences as part of the caching key for notes.

### Why was this MR needed?

This should fix a bug introduced via 4d80360b where notes were being loaded from the cache without regard to the current user's color scheme.

### What are the relevant issue numbers?

Closes #2008

See merge request !994
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix bug where notes were being rendered with wrong color preferences due to caching

### What does this MR do?

This MR adds the user's color preferences as part of the caching key for notes.

### Why was this MR needed?

This should fix a bug introduced via 4d80360b where notes were being loaded from the cache without regard to the current user's color scheme.

### What are the relevant issue numbers?

Closes #2008

See merge request !994
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-oauth-redirection' into 'master'</title>
<updated>2015-07-19T07:06:21+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2015-07-19T07:06:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=247609a3d8fc9c1b5cf728fdbea303a15ec640db'/>
<id>247609a3d8fc9c1b5cf728fdbea303a15ec640db</id>
<content type='text'>
Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in

### What does this MR do?

This MR fixes a bug when GitLab is used as an OAuth provider (e.g. to GitLab CI) where the user is not redirected back to the original URI after a successful sign-in. This MR tweaks the Doorkeeper configuration to set the `user_return_to` Devise session variable, as mentioned in this [Stack Overflow](http://stackoverflow.com/questions/14504739/how-to-use-both-devise-and-doorkeeper-gems) post.

### Why was this MR needed?

If you attempt to "Login via GitLab" from GitLab CI and aren't logged out completely, GitLab asks for your username and password. After you login, you get directed to the GitLab dashboard instead of back to GitLab CI. It's easy to reproduce:

1. Set up a GitLab CI and GitLab instance (e.g. ci.gitlab.com, gitlab.com).
2. Start an Incognito Window so that you are logged out of GitLab CI and GitLab.
3. Go to the GitLab CI instance. Click the "Login with GitLab".
4. Enter in your credentials.
5. Watch your browser login to GitLab and not return to GitLab CI.

### What are the relevant issue numbers?

Closes #1612

See merge request !998
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in

### What does this MR do?

This MR fixes a bug when GitLab is used as an OAuth provider (e.g. to GitLab CI) where the user is not redirected back to the original URI after a successful sign-in. This MR tweaks the Doorkeeper configuration to set the `user_return_to` Devise session variable, as mentioned in this [Stack Overflow](http://stackoverflow.com/questions/14504739/how-to-use-both-devise-and-doorkeeper-gems) post.

### Why was this MR needed?

If you attempt to "Login via GitLab" from GitLab CI and aren't logged out completely, GitLab asks for your username and password. After you login, you get directed to the GitLab dashboard instead of back to GitLab CI. It's easy to reproduce:

1. Set up a GitLab CI and GitLab instance (e.g. ci.gitlab.com, gitlab.com).
2. Start an Incognito Window so that you are logged out of GitLab CI and GitLab.
3. Go to the GitLab CI instance. Click the "Login with GitLab".
4. Enter in your credentials.
5. Watch your browser login to GitLab and not return to GitLab CI.

### What are the relevant issue numbers?

Closes #1612

See merge request !998
</pre>
</div>
</content>
</entry>
</feed>
