diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-21 05:13:36 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-21 05:13:36 +0000 |
| commit | b6e249744cd0fe2280b4e56c0c58007f5b07057d (patch) | |
| tree | 214206e9fd9d50e90ead08fe466124fd48fb8901 /lib/api/notes.rb | |
| parent | b5ef5cc6acd0a583a68ee606ae6005a1f6d16df3 (diff) | |
| parent | 9a7815e4e2fabbfa6b4e6209829b9f9684ec617d (diff) | |
| download | gitlab-ce-b6e249744cd0fe2280b4e56c0c58007f5b07057d.tar.gz | |
Merge branch 'rs-revert-csp' into 'master'
Revert Content Security Policy
The secure-only cookies setting was causing an issue where the session was
constantly being lost in the development environment.
Revert "Merge branch 'csp-basics' into 'master'"
This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing
changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
---
Revert "Merge branch 'remove-csp-sentry-reporting' into 'master'"
This reverts commit 79b02e40e5842540ceff4454f6c2c51f13fc081c, reversing
changes made to f2cd21e8946dcef13e8be408b96b079b5ced682a.
See merge request !5381
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions