Merge branch 'master' into redesign

[rails.git] / app / views / oauth / authorize_success.html.erb

diff --git a/app/views/oauth/authorize_success.html.erb b/app/views/oauth/authorize_success.html.erb
index a25b98ec782fda42c7f9f3ee0ecd11b656c7c670..aa2a52f66579cc2376f6c03da96f25f11b97990f 100644 (file)
--- a/app/views/oauth/authorize_success.html.erb
+++ b/app/views/oauth/authorize_success.html.erb
@@ -1,5 +1,7 @@
-<h1>You have allowed this request</h1>
+<% content_for :heading do %>
+  <h1>You have allowed this request</h1>
+<% end %>
 
-<% if @token.oob? %>
+<% if @token.oob? and not @token.oauth10? %>
 <p>The verification code is <%= @token.verifier %></p>
 <% end %>