Download as
Browse Code »

Commit d721863382b3e2cedae03e8f235809eb409224c0

Authored by Andrey Kumanyaev
Committed by Dmitriy Zaporozhets
1 parent 31d84d71
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix little bugs

Showing 3 changed files with 5 additions and 3 deletions   Show diff stats
app/controllers/teams_controller.rb
  Diff comments   View file @d721863
... ... @@ -54,6 +54,7 @@ class TeamsController < ApplicationController
54 54  
55 55 # Get authored or assigned open merge requests
56 56 def merge_requests
  57 + projects
57 58 @merge_requests = MergeRequest.of_user_team(user_team)
58 59 @merge_requests = FilterContext.new(@merge_requests, params).execute
59 60 @merge_requests = @merge_requests.recent.page(params[:page]).per(20)
... ... @@ -61,6 +62,7 @@ class TeamsController < ApplicationController
61 62  
62 63 # Get only assigned issues
63 64 def issues
  65 + projects
64 66 @issues = Issue.of_user_team(user_team)
65 67 @issues = FilterContext.new(@issues, params).execute
66 68 @issues = @issues.recent.page(params[:page]).per(20)
... ...
app/helpers/user_teams_helper.rb
  Diff comments   View file @d721863
... ... @@ -9,9 +9,9 @@ module UserTeamsHelper
9 9  
10 10 case entity
11 11 when 'issue' then
12   - issues_team_path(@user_team, options)
  12 + issues_team_path(@team, options)
13 13 when 'merge_request'
14   - merge_requests_team_path(@user_team, options)
  14 + merge_requests_team_path(@team, options)
15 15 end
16 16 end
17 17  
... ...
config/routes.rb
  Diff comments   View file @d721863
... ... @@ -21,7 +21,7 @@ Gitlab::Application.routes.draw do
21 21 project_root: Gitlab.config.gitolite.repos_path,
22 22 upload_pack: Gitlab.config.gitolite.upload_pack,
23 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 27 # Help
... ...