From d721863382b3e2cedae03e8f235809eb409224c0 Mon Sep 17 00:00:00 2001
From: Andrey Kumanyaev <me@zzet.org>
Date: Wed, 23 Jan 2013 18:14:53 +0400
Subject: [PATCH] Fix little bugs

---
 app/controllers/teams_controller.rb | 2 ++
 app/helpers/user_teams_helper.rb    | 4 ++--
 config/routes.rb                    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index 169ee34f..ea060b3a 100644
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -54,6 +54,7 @@ class TeamsController < ApplicationController
 
   # Get authored or assigned open merge requests
   def merge_requests
+    projects
     @merge_requests = MergeRequest.of_user_team(user_team)
     @merge_requests = FilterContext.new(@merge_requests, params).execute
     @merge_requests = @merge_requests.recent.page(params[:page]).per(20)
@@ -61,6 +62,7 @@ class TeamsController < ApplicationController
 
   # Get only assigned issues
   def issues
+    projects
     @issues = Issue.of_user_team(user_team)
     @issues = FilterContext.new(@issues, params).execute
     @issues = @issues.recent.page(params[:page]).per(20)
diff --git a/app/helpers/user_teams_helper.rb b/app/helpers/user_teams_helper.rb
index 60deb9e0..2055bb3c 100644
--- a/app/helpers/user_teams_helper.rb
+++ b/app/helpers/user_teams_helper.rb
@@ -9,9 +9,9 @@ module UserTeamsHelper
 
     case entity
     when 'issue' then
-      issues_team_path(@user_team, options)
+      issues_team_path(@team, options)
     when 'merge_request'
-      merge_requests_team_path(@user_team, options)
+      merge_requests_team_path(@team, options)
     end
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index a19ab14f..387f94ba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,7 +21,7 @@ Gitlab::Application.routes.draw do
     project_root: Gitlab.config.gitolite.repos_path,
     upload_pack:  Gitlab.config.gitolite.upload_pack,
     receive_pack: Gitlab.config.gitolite.receive_pack
-  }), at: '/', constraints: lambda { |request| /[-\/\w\.-]+\.git\//.match(request.path_info) }
+  }), at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }
 
   #
   # Help