branch/tag remember - to session instead of cookie

This commit is contained in:
gitlabhq 2011-10-14 18:33:05 +03:00
parent fc34fc86c6
commit 2d577cae9d
4 changed files with 19 additions and 17 deletions

View file

@ -43,11 +43,14 @@ class ApplicationController < ActionController::Base
end
def refs_from_cookie
# branch is high priority so we should reset
# it if tag selected
cookies[:branch] = nil if params[:tag]
params[:branch] ||= cookies[:branch]
params[:tag] ||= cookies[:tag]
if @project && session[:ui] &&
session[:ui][@project.id]
project_session = session[:ui][@project.id]
project_session[:branch] = nil if params[:tag]
params[:branch] ||= project_session[:branch]
params[:tag] ||= project_session[:tag]
end
rescue
session[:ui] = nil
end
end