Commit d721863382b3e2cedae03e8f235809eb409224c0
Committed by
Dmitriy Zaporozhets
Dmitriy Zaporozhets
1 parent
31d84d71
Exists in
master
and in
4 other branches
Fix little bugs
Showing
3 changed files
with
5 additions
and
3 deletions
Show diff stats
app/controllers/teams_controller.rb
| @@ -54,6 +54,7 @@ class TeamsController < ApplicationController | @@ -54,6 +54,7 @@ class TeamsController < ApplicationController | ||
| 54 | 54 | ||
| 55 | # Get authored or assigned open merge requests | 55 | # Get authored or assigned open merge requests |
| 56 | def merge_requests | 56 | def merge_requests |
| 57 | + projects | ||
| 57 | @merge_requests = MergeRequest.of_user_team(user_team) | 58 | @merge_requests = MergeRequest.of_user_team(user_team) |
| 58 | @merge_requests = FilterContext.new(@merge_requests, params).execute | 59 | @merge_requests = FilterContext.new(@merge_requests, params).execute |
| 59 | @merge_requests = @merge_requests.recent.page(params[:page]).per(20) | 60 | @merge_requests = @merge_requests.recent.page(params[:page]).per(20) |
| @@ -61,6 +62,7 @@ class TeamsController < ApplicationController | @@ -61,6 +62,7 @@ class TeamsController < ApplicationController | ||
| 61 | 62 | ||
| 62 | # Get only assigned issues | 63 | # Get only assigned issues |
| 63 | def issues | 64 | def issues |
| 65 | + projects | ||
| 64 | @issues = Issue.of_user_team(user_team) | 66 | @issues = Issue.of_user_team(user_team) |
| 65 | @issues = FilterContext.new(@issues, params).execute | 67 | @issues = FilterContext.new(@issues, params).execute |
| 66 | @issues = @issues.recent.page(params[:page]).per(20) | 68 | @issues = @issues.recent.page(params[:page]).per(20) |
app/helpers/user_teams_helper.rb
| @@ -9,9 +9,9 @@ module UserTeamsHelper | @@ -9,9 +9,9 @@ module UserTeamsHelper | ||
| 9 | 9 | ||
| 10 | case entity | 10 | case entity |
| 11 | when 'issue' then | 11 | when 'issue' then |
| 12 | - issues_team_path(@user_team, options) | 12 | + issues_team_path(@team, options) |
| 13 | when 'merge_request' | 13 | when 'merge_request' |
| 14 | - merge_requests_team_path(@user_team, options) | 14 | + merge_requests_team_path(@team, options) |
| 15 | end | 15 | end |
| 16 | end | 16 | end |
| 17 | 17 |
config/routes.rb
| @@ -21,7 +21,7 @@ Gitlab::Application.routes.draw do | @@ -21,7 +21,7 @@ Gitlab::Application.routes.draw do | ||
| 21 | project_root: Gitlab.config.gitolite.repos_path, | 21 | project_root: Gitlab.config.gitolite.repos_path, |
| 22 | upload_pack: Gitlab.config.gitolite.upload_pack, | 22 | upload_pack: Gitlab.config.gitolite.upload_pack, |
| 23 | receive_pack: Gitlab.config.gitolite.receive_pack | 23 | receive_pack: Gitlab.config.gitolite.receive_pack |
| 24 | - }), at: '/', constraints: lambda { |request| /[-\/\w\.-]+\.git\//.match(request.path_info) } | 24 | + }), at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) } |
| 25 | 25 | ||
| 26 | # | 26 | # |
| 27 | # Help | 27 | # Help |