diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-06-20 10:38:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-06-20 10:38:33 +0000 |
| commit | b2eef41d41d603bf9d5340f26bbe640363f608e6 (patch) | |
| tree | 8cf126e3170fce041133d76b152eeaccd0cd2256 /CHANGELOG | |
| parent | cbb1353b288a8c22e3e93dcdb011c27b11c6dd16 (diff) | |
| parent | e785b9d2e24ca7e16e8ff3fa46f2e2b82478be9b (diff) | |
| download | gitlab-ce-b2eef41d41d603bf9d5340f26bbe640363f608e6.tar.gz | |
Merge branch 'fix-error-500-internal-snippet' into 'master'
Fix Error 500 when one user attempts to access another's personal, internal snippet
### What does this MR do?
This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce:
### Why was this MR needed?
1. Go to `<hostname>/snippets/new`.
2. Select "Internal".
3. Create a snippet. Save the URL (e.g. `<hostname>/snippets/20`)
4. Logout and sign in as another user.
5. Go to the URL in step 3.
### What are the relevant issue numbers?
Closes #1815
See merge request !854
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2d03cd1d763..9453f315325 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 7.13.0 (unreleased) - Update ssl_ciphers in Nginx example to remove DHE settings. This will deny forward secrecy for Android 2.3.7, Java 6 and OpenSSL 0.9.8 v 7.12.0 (unreleased) + - Fix Error 500 when one user attempts to access a personal, internal snippet (Stan Hu) - Fix post-receive errors on a push when an external issue tracker is configured (Stan Hu) - Update oauth button logos for Twitter and Google to recommended assets - Fix hooks for web based events with external issue references (Daniel Gerhardt) |