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
b7431ec0
Commit
b7431ec0
authored
Sep 04, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make all group public
parent
349054e0
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
51 additions
and
48 deletions
+51
-48
CHANGELOG
CHANGELOG
+1
-1
app/models/ability.rb
app/models/ability.rb
+1
-1
app/models/group.rb
app/models/group.rb
+0
-4
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+7
-7
features/explore/groups.feature
features/explore/groups.feature
+0
-14
features/groups.feature
features/groups.feature
+11
-0
features/steps/groups.rb
features/steps/groups.rb
+20
-0
spec/controllers/namespaces_controller_spec.rb
spec/controllers/namespaces_controller_spec.rb
+2
-4
spec/controllers/uploads_controller_spec.rb
spec/controllers/uploads_controller_spec.rb
+0
-8
spec/features/security/group_access_spec.rb
spec/features/security/group_access_spec.rb
+9
-9
No files found.
CHANGELOG
View file @
b7431ec0
...
@@ -29,7 +29,7 @@ v 8.0.0 (unreleased)
...
@@ -29,7 +29,7 @@ v 8.0.0 (unreleased)
- Fix 500 error when submit project snippet without body
- Fix 500 error when submit project snippet without body
- Improve search page usability
- Improve search page usability
- Bring more UI consistency in way how projects, snippets and groups lists are rendered
- Bring more UI consistency in way how projects, snippets and groups lists are rendered
- Make all profiles public
- Make all profiles
and group
public
- Fixed login failure when extern_uid changes (Joel Koglin)
- Fixed login failure when extern_uid changes (Joel Koglin)
- Don't notify users without access to the project when they are (accidentally) mentioned in a note.
- Don't notify users without access to the project when they are (accidentally) mentioned in a note.
- Retrieving oauth token with LDAP credentials
- Retrieving oauth token with LDAP credentials
...
...
app/models/ability.rb
View file @
b7431ec0
...
@@ -54,7 +54,7 @@ class Ability
...
@@ -54,7 +54,7 @@ class Ability
nil
nil
end
end
if
group
&&
group
.
public_profile?
if
group
[
:read_group
]
[
:read_group
]
else
else
[]
[]
...
...
app/models/group.rb
View file @
b7431ec0
...
@@ -119,10 +119,6 @@ class Group < Namespace
...
@@ -119,10 +119,6 @@ class Group < Namespace
end
end
end
end
def
public_profile?
projects
.
public_only
.
any?
end
def
post_create_hook
def
post_create_hook
Gitlab
::
AppLogger
.
info
(
"Group
\"
#{
name
}
\"
was created"
)
Gitlab
::
AppLogger
.
info
(
"Group
\"
#{
name
}
\"
was created"
)
...
...
app/views/groups/show.html.haml
View file @
b7431ec0
...
@@ -22,16 +22,16 @@
...
@@ -22,16 +22,16 @@
-
if
current_user
-
if
current_user
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
-
if
current_user
%ul
.nav.nav-pills.event_filter.pull-right
%ul
.nav.nav-pills.event_filter.pull-right
%li
%li
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'rss-btn'
do
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'rss-btn'
do
%i
.fa.fa-rss
%i
.fa.fa-rss
=
render
'shared/event_filter'
=
render
'shared/event_filter'
%hr
%hr
.content_list
.content_list
=
spinner
=
spinner
%aside
.side.col-md-5
-
if
@projects
.
any?
=
render
"projects"
,
projects:
@projects
%aside
.side.col-md-5
=
render
"projects"
,
projects:
@projects
features/explore/groups.feature
View file @
b7431ec0
...
@@ -3,20 +3,6 @@ Feature: Explore Groups
...
@@ -3,20 +3,6 @@ Feature: Explore Groups
Background
:
Background
:
Given
group
"TestGroup"
has private project
"Enterprise"
Given
group
"TestGroup"
has private project
"Enterprise"
Scenario
:
I
should not see group with private projects as visitor
When
I visit group
"TestGroup"
page
Then
I should be redirected to sign in page
Scenario
:
I
should not see group with private projects group as user
When
I sign in as a user
And
I visit group
"TestGroup"
page
Then
page status code should be 404
Scenario
:
I
should not see group with private and internal projects as visitor
Given
group
"TestGroup"
has internal project
"Internal"
When
I visit group
"TestGroup"
page
Then
I should be redirected to sign in page
Scenario
:
I
should see group with private and internal projects as user
Scenario
:
I
should see group with private and internal projects as user
Given
group
"TestGroup"
has internal project
"Internal"
Given
group
"TestGroup"
has internal project
"Internal"
When
I sign in as a user
When
I sign in as a user
...
...
features/groups.feature
View file @
b7431ec0
...
@@ -159,3 +159,14 @@ Feature: Groups
...
@@ -159,3 +159,14 @@ Feature: Groups
When
I visit group
"Owned"
projects page
When
I visit group
"Owned"
projects page
Then
I should see group
"Owned"
projects list
Then
I should see group
"Owned"
projects list
And
I should see
"archived"
label
And
I should see
"archived"
label
# Public group
@javascript
Scenario
:
Signed out user should see group
Given
"Mary Jane"
is owner of group
"Owned"
And
I am a signed out user
And
Group
"Owned"
has a public project
"Public-project"
When
I visit group
"Owned"
page
Then
I should see group
"Owned"
Then
I should see project
"Public-project"
features/steps/groups.rb
View file @
b7431ec0
...
@@ -17,6 +17,26 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
...
@@ -17,6 +17,26 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
find
(
:css
,
'button.btn-new'
).
click
find
(
:css
,
'button.btn-new'
).
click
end
end
step
'I should see group "Owned"'
do
expect
(
page
).
to
have_content
'@owned'
end
step
'I am a signed out user'
do
logout
end
step
'Group "Owned" has a public project "Public-project"'
do
group
=
Group
.
find_by
(
name:
"Owned"
)
@project
=
create
:empty_project
,
:public
,
group:
group
,
name:
"Public-project"
end
step
'I should see project "Public-project"'
do
expect
(
page
).
to
have_content
'Public-project'
end
step
'I select "Mike" as "Reporter"'
do
step
'I select "Mike" as "Reporter"'
do
user
=
User
.
find_by
(
name:
"Mike"
)
user
=
User
.
find_by
(
name:
"Mike"
)
...
...
spec/controllers/namespaces_controller_spec.rb
View file @
b7431ec0
...
@@ -46,13 +46,11 @@ describe NamespacesController do
...
@@ -46,13 +46,11 @@ describe NamespacesController do
context
"when the project doesn't have public projects"
do
context
"when the project doesn't have public projects"
do
context
"when not signed in"
do
context
"when not signed in"
do
it
"
redirects
to the sign in page"
do
it
"
does not redirect
to the sign in page"
do
get
:show
,
id:
group
.
path
get
:show
,
id:
group
.
path
expect
(
response
).
not_to
redirect_to
(
new_user_session_path
)
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
end
end
end
end
context
"when signed in"
do
context
"when signed in"
do
before
do
before
do
sign_in
(
user
)
sign_in
(
user
)
...
...
spec/controllers/uploads_controller_spec.rb
View file @
b7431ec0
...
@@ -156,14 +156,6 @@ describe UploadsController do
...
@@ -156,14 +156,6 @@ describe UploadsController do
end
end
context
"when the project doesn't have public projects"
do
context
"when the project doesn't have public projects"
do
context
"when not signed in"
do
it
"redirects to the sign in page"
do
get
:show
,
model:
"group"
,
mounted_as:
"avatar"
,
id:
group
.
id
,
filename:
"image.png"
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
end
end
context
"when signed in"
do
context
"when signed in"
do
before
do
before
do
sign_in
(
user
)
sign_in
(
user
)
...
...
spec/features/security/group_access_spec.rb
View file @
b7431ec0
...
@@ -68,7 +68,7 @@ describe 'Group access', feature: true do
...
@@ -68,7 +68,7 @@ describe 'Group access', feature: true do
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_
deni
ed_for
:visitor
}
it
{
is_expected
.
to
be_
allow
ed_for
:visitor
}
end
end
context
'with no projects'
do
context
'with no projects'
do
...
@@ -77,8 +77,8 @@ describe 'Group access', feature: true do
...
@@ -77,8 +77,8 @@ describe 'Group access', feature: true do
it
{
is_expected
.
to
be_allowed_for
group_member
(
:reporter
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:reporter
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_
deni
ed_for
:user
}
it
{
is_expected
.
to
be_
allow
ed_for
:user
}
it
{
is_expected
.
to
be_
deni
ed_for
:visitor
}
it
{
is_expected
.
to
be_
allow
ed_for
:visitor
}
end
end
end
end
...
@@ -118,7 +118,7 @@ describe 'Group access', feature: true do
...
@@ -118,7 +118,7 @@ describe 'Group access', feature: true do
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_
deni
ed_for
:visitor
}
it
{
is_expected
.
to
be_
allow
ed_for
:visitor
}
end
end
context
'with no projects'
do
context
'with no projects'
do
...
@@ -128,7 +128,7 @@ describe 'Group access', feature: true do
...
@@ -128,7 +128,7 @@ describe 'Group access', feature: true do
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_denied_for
:user
}
it
{
is_expected
.
to
be_denied_for
:user
}
it
{
is_expected
.
to
be_
deni
ed_for
:visitor
}
it
{
is_expected
.
to
be_
allow
ed_for
:visitor
}
end
end
end
end
...
@@ -168,7 +168,7 @@ describe 'Group access', feature: true do
...
@@ -168,7 +168,7 @@ describe 'Group access', feature: true do
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_
deni
ed_for
:visitor
}
it
{
is_expected
.
to
be_
allow
ed_for
:visitor
}
end
end
context
'with no projects'
do
context
'with no projects'
do
...
@@ -178,7 +178,7 @@ describe 'Group access', feature: true do
...
@@ -178,7 +178,7 @@ describe 'Group access', feature: true do
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_denied_for
:user
}
it
{
is_expected
.
to
be_denied_for
:user
}
it
{
is_expected
.
to
be_
deni
ed_for
:visitor
}
it
{
is_expected
.
to
be_
allow
ed_for
:visitor
}
end
end
end
end
...
@@ -218,7 +218,7 @@ describe 'Group access', feature: true do
...
@@ -218,7 +218,7 @@ describe 'Group access', feature: true do
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_
deni
ed_for
:visitor
}
it
{
is_expected
.
to
be_
allow
ed_for
:visitor
}
end
end
context
'with no projects'
do
context
'with no projects'
do
...
@@ -228,7 +228,7 @@ describe 'Group access', feature: true do
...
@@ -228,7 +228,7 @@ describe 'Group access', feature: true do
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
group_member
(
:guest
)
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_denied_for
:user
}
it
{
is_expected
.
to
be_denied_for
:user
}
it
{
is_expected
.
to
be_
deni
ed_for
:visitor
}
it
{
is_expected
.
to
be_
allow
ed_for
:visitor
}
end
end
end
end
...
...
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