Merge branch 'master' into devel
This commit is contained in:
commit
0ad2392af5
1 changed files with 1 additions and 1 deletions
|
@ -22,7 +22,7 @@ class SessionsController < ApplicationController
|
||||||
|
|
||||||
@user = User.new
|
@user = User.new
|
||||||
|
|
||||||
@map = Map.first(:conditions => [ "id = ?", 5])
|
@map = Map.first(:conditions => [ "id = ?", 5])
|
||||||
|
|
||||||
if @map
|
if @map
|
||||||
respond_with(@user, @session, location: map_url(@map)) do |format|
|
respond_with(@user, @session, location: map_url(@map)) do |format|
|
||||||
|
|
Loading…
Reference in a new issue