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
Boxiang Sun
gitlab-ce
Commits
68453632
Commit
68453632
authored
Dec 28, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Admin group show page does not work
parent
b93c72e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
app/controllers/admin/groups_controller.rb
app/controllers/admin/groups_controller.rb
+1
-1
spec/features/admin/admin_groups_spec.rb
spec/features/admin/admin_groups_spec.rb
+10
-0
No files found.
app/controllers/admin/groups_controller.rb
View file @
68453632
...
@@ -9,7 +9,7 @@ class Admin::GroupsController < Admin::ApplicationController
...
@@ -9,7 +9,7 @@ class Admin::GroupsController < Admin::ApplicationController
end
end
def
show
def
show
@group
=
Group
.
with_statistics
.
find_by_full_path
(
params
[
:id
])
@group
=
Group
.
with_statistics
.
joins
(
:route
).
group
(
'routes.path'
).
find_by_full_path
(
params
[
:id
])
@members
=
@group
.
members
.
order
(
"access_level DESC"
).
page
(
params
[
:members_page
])
@members
=
@group
.
members
.
order
(
"access_level DESC"
).
page
(
params
[
:members_page
])
@requesters
=
AccessRequestsFinder
.
new
(
@group
).
execute
(
current_user
)
@requesters
=
AccessRequestsFinder
.
new
(
@group
).
execute
(
current_user
)
@projects
=
@group
.
projects
.
with_statistics
.
page
(
params
[
:projects_page
])
@projects
=
@group
.
projects
.
with_statistics
.
page
(
params
[
:projects_page
])
...
...
spec/features/admin/admin_groups_spec.rb
View file @
68453632
...
@@ -17,6 +17,16 @@ feature 'Admin Groups', feature: true do
...
@@ -17,6 +17,16 @@ feature 'Admin Groups', feature: true do
end
end
end
end
describe
'show a group'
do
scenario
'shows the group'
do
group
=
create
(
:group
,
:private
)
visit
admin_group_path
(
group
)
expect
(
page
).
to
have_content
(
"Group:
#{
group
.
name
}
"
)
end
end
describe
'group edit'
do
describe
'group edit'
do
scenario
'shows the visibility level radio populated with the group visibility_level value'
do
scenario
'shows the visibility level radio populated with the group visibility_level value'
do
group
=
create
(
:group
,
:private
)
group
=
create
(
:group
,
:private
)
...
...
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