diff options
| author | Marius Mathiesen <marius@gitorious.org> | 2013-01-18 09:30:00 (GMT) |
|---|---|---|
| committer | Marius Mathiesen <marius@gitorious.org> | 2013-01-18 09:30:00 (GMT) |
| commit | 523dbe5f0e7924f1ae17bf61d3e5546559b05ad8 (patch) | |
| tree | 9a618e310e6a3f38f9d8e060fa36480b85d6ab2a | |
| parent | 5ce56a5259e288042a4a458520773dd7f7d32587 (diff) | |
| parent | 91a24c70073a770edf91b73790cb38492fd7d6f6 (diff) | |
Merge branch '2.x-stable'
| -rw-r--r-- | app/views/layouts/_common_head.html.erb | 1 | ||||
| -rw-r--r-- | public/javascripts/gitorious/jquery.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb index 4bb433c..c161371 100644 --- a/app/views/layouts/_common_head.html.erb +++ b/app/views/layouts/_common_head.html.erb @@ -30,4 +30,5 @@ <%= yield :extra_head -%> <!--[if IE 8]><link rel="stylesheet" href="/stylesheets/ie8.css" type="text/css"><![endif]--> <!--[if IE 7]><link rel="stylesheet" href="/stylesheets/ie7.css" type="text/css"><![endif]--> +<%= csrf_meta_tag %> <%= GitoriousConfig["extra_html_head_data"] -%> diff --git a/public/javascripts/gitorious/jquery.js b/public/javascripts/gitorious/jquery.js index e6c0ce4..0974456 100644 --- a/public/javascripts/gitorious/jquery.js +++ b/public/javascripts/gitorious/jquery.js @@ -25,6 +25,7 @@ $.ajaxSetup({ "beforeSend": function (xhr) { xhr.setRequestHeader("Accept", "text/javascript"); + xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content')) }, "complete": function () { |