Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
d7218633
Commit
d7218633
authored
Jan 23, 2013
by
Andrey Kumanyaev
Committed by
Dmitriy Zaporozhets
Jan 24, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix little bugs
parent
31d84d71
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
app/controllers/teams_controller.rb
app/controllers/teams_controller.rb
+2
-0
app/helpers/user_teams_helper.rb
app/helpers/user_teams_helper.rb
+2
-2
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/controllers/teams_controller.rb
View file @
d7218633
...
@@ -54,6 +54,7 @@ class TeamsController < ApplicationController
...
@@ -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
...
@@ -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
)
...
...
app/helpers/user_teams_helper.rb
View file @
d7218633
...
@@ -9,9 +9,9 @@ module UserTeamsHelper
...
@@ -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
...
...
config/routes.rb
View file @
d7218633
...
@@ -21,7 +21,7 @@ Gitlab::Application.routes.draw do
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment