projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
98f34e4
)
Only show login/signup in slim mode when used from oauth
author
Tom Hughes
<tom@compton.nu>
Sun, 3 Apr 2011 10:16:57 +0000
(11:16 +0100)
committer
Tom Hughes
<tom@compton.nu>
Sun, 3 Apr 2011 12:46:18 +0000
(13:46 +0100)
app/controllers/user_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/user_controller.rb
b/app/controllers/user_controller.rb
index ed17c1e41ea04e32f32c7e47fe235bce83637659..25dd18f9223b905493baf91b50b1f5ecfd5568e3 100644
(file)
--- a/
app/controllers/user_controller.rb
+++ b/
app/controllers/user_controller.rb
@@
-503,7
+503,7
@@
private
def choose_layout
if [ 'api_details' ].include? action_name
nil
- elsif
[ 'login', 'new', 'terms'].include? action_name
+ elsif
params[:referer] == url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
'slim'
else
'site'