deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix little bugs

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-23 18:14:53 +04:00 committed by Dmitriy Zaporozhets
parent 31d84d71d3
commit d721863382
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/teams_controller.rb
View file

@ -54,6 +54,7 @@ class TeamsController < ApplicationController
# Get authored or assigned open merge requests # Get authored or assigned open merge requests
def merge_requests def merge_requests
projects
@merge_requests = MergeRequest.of_user_team(user_team) @merge_requests = MergeRequest.of_user_team(user_team)
@merge_requests = FilterContext.new(@merge_requests, params).execute @merge_requests = FilterContext.new(@merge_requests, params).execute
@merge_requests = @merge_requests.recent.page(params[:page]).per(20) @merge_requests = @merge_requests.recent.page(params[:page]).per(20)
@ -61,6 +62,7 @@ class TeamsController < ApplicationController
# Get only assigned issues # Get only assigned issues
def issues def issues
projects
@issues = Issue.of_user_team(user_team) @issues = Issue.of_user_team(user_team)
@issues = FilterContext.new(@issues, params).execute @issues = FilterContext.new(@issues, params).execute
@issues = @issues.recent.page(params[:page]).per(20) @issues = @issues.recent.page(params[:page]).per(20)

4
app/helpers/user_teams_helper.rb
View file

@ -9,9 +9,9 @@ module UserTeamsHelper
case entity case entity
when 'issue' then when 'issue' then
issues_team_path(@user_team, options) issues_team_path(@team, options)
when 'merge_request' when 'merge_request'
merge_requests_team_path(@user_team, options) merge_requests_team_path(@team, options)
end end
end end

2
config/routes.rb
View file

@ -21,7 +21,7 @@ Gitlab::Application.routes.draw do
project_root: Gitlab.config.gitolite.repos_path, project_root: Gitlab.config.gitolite.repos_path,
upload_pack: Gitlab.config.gitolite.upload_pack, upload_pack: Gitlab.config.gitolite.upload_pack,
receive_pack: Gitlab.config.gitolite.receive_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 # Help