Skip to content

Commit

Permalink
Merge branch 'rs-safari-version-check' into 'master'
Browse files Browse the repository at this point in the history
Don't attempt to set Referrer policy in Safari

While Safari supports the policy, it does not (currently, as of 9.x)
recognize `origin-when-cross-origin` as a valid value, so we omit the
policy entirely under Safari.

Closes #5609

See merge request !2269
  • Loading branch information
dzaporozhets committed Jan 3, 2016
2 parents de6b6cc + 9a9a81b commit bfb3c8d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ v 8.4.0 (unreleased)
- Add link to merge request on build detail page
- Revert back upvote and downvote button to the issue and MR pages
- Swap position of Assignee and Author selector on Issuables (Zeger-Jan van de Weg)
- Fix version check image in Safari

v 8.3.3 (unreleased)
- Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu)
Expand Down
9 changes: 4 additions & 5 deletions app/views/layouts/_head.html.haml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
%head{prefix: "og: http://ogp.me/ns#"}
%meta{charset: "utf-8"}
%meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge'}
%meta{name: 'referrer', content: 'origin-when-cross-origin'}
%meta{name: "description", content: page_description}
-# Open Graph - http://ogp.me/
%meta{property: 'og:type', content: "object"}
Expand All @@ -20,8 +17,8 @@
%meta{property: 'twitter:image', content: page_image}
= page_card_meta_tags
- page_title "GitLab"
%title= page_title
%title= page_title('GitLab')
%meta{name: "description", content: page_description}
= favicon_link_tag 'favicon.ico'
Expand All @@ -34,6 +31,8 @@
= include_gon
- unless browser.safari?
%meta{name: 'referrer', content: 'origin-when-cross-origin'}
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
%meta{name: 'theme-color', content: '#474D57'}
Expand Down

0 comments on commit bfb3c8d

Please sign in to comment.