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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
fd2b2dc1
Commit
fd2b2dc1
authored
8 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
parents
c6bfad2a
f1a85747
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
65 additions
and
9 deletions
+65
-9
CHANGELOG
CHANGELOG
+2
-0
app/models/concerns/mentionable.rb
app/models/concerns/mentionable.rb
+1
-1
app/services/todo_service.rb
app/services/todo_service.rb
+1
-1
doc/integration/omniauth.md
doc/integration/omniauth.md
+9
-3
lib/gitlab/o_auth/user.rb
lib/gitlab/o_auth/user.rb
+0
-2
spec/lib/gitlab/o_auth/user_spec.rb
spec/lib/gitlab/o_auth/user_spec.rb
+15
-2
spec/models/concerns/mentionable_spec.rb
spec/models/concerns/mentionable_spec.rb
+37
-0
No files found.
CHANGELOG
View file @
fd2b2dc1
...
...
@@ -36,6 +36,8 @@ v 8.10.0 (unreleased)
- More descriptive message for git hooks and file locks
- Handle custom Git hook result in GitLab UI
v 8.9.4 (unreleased)
- Ensure references to private repos aren't shown to logged-out users
v 8.9.5 (unreleased)
- Improve the request / withdraw access button. !4860
- Fix assigning shared runners as admins. !4961
...
...
This diff is collapsed.
Click to expand it.
app/models/concerns/mentionable.rb
View file @
fd2b2dc1
...
...
@@ -45,7 +45,7 @@ module Mentionable
def
all_references
(
current_user
=
nil
,
text
=
nil
,
extractor:
nil
)
extractor
||=
Gitlab
::
ReferenceExtractor
.
new
(
project
,
current_user
||
author
)
new
(
project
,
current_user
)
if
text
extractor
.
analyze
(
text
,
author:
author
)
...
...
This diff is collapsed.
Click to expand it.
app/services/todo_service.rb
View file @
fd2b2dc1
...
...
@@ -237,7 +237,7 @@ class TodoService
end
def
filter_mentioned_users
(
project
,
target
,
author
)
mentioned_users
=
target
.
mentioned_users
mentioned_users
=
target
.
mentioned_users
(
author
)
mentioned_users
=
reject_users_without_access
(
mentioned_users
,
project
,
target
)
mentioned_users
.
delete
(
author
)
mentioned_users
.
uniq
...
...
This diff is collapsed.
Click to expand it.
doc/integration/omniauth.md
View file @
fd2b2dc1
...
...
@@ -127,9 +127,15 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab
This setting was introduced with version 8.7 of GitLab
You can define which OmniAuth providers you want to be
`external`
so that all users
creating accounts via these providers will not be able to have access to internal
projects. You will need to use the full name of the provider, like
`google_oauth2`
for Google. Refer to the examples for the full names of the supported providers.
**creating accounts, or logging in via these providers**
will not be able to have
access to internal projects. You will need to use the full name of the provider,
like
`google_oauth2`
for Google. Refer to the examples for the full names of the
supported providers.
>**Note:**
If you decide to remove an OmniAuth provider from the external providers list
you will need to manually update the users that use this method to login, if you
want their accounts to be upgraded to full internal accounts.
**For Omnibus installations**
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/o_auth/user.rb
View file @
fd2b2dc1
...
...
@@ -56,8 +56,6 @@ module Gitlab
if
external_provider?
&&
@user
@user
.
external
=
true
elsif
@user
@user
.
external
=
false
end
@user
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/o_auth/user_spec.rb
View file @
fd2b2dc1
...
...
@@ -51,12 +51,25 @@ describe Gitlab::OAuth::User, lib: true do
end
context
'provider was external, now has been removed'
do
it
'should
mark existing user
internal'
do
it
'should
not mark external user as
internal'
do
create
(
:omniauth_user
,
extern_uid:
'my-uid'
,
provider:
'twitter'
,
external:
true
)
stub_omniauth_config
(
allow_single_sign_on:
[
'twitter'
],
external_providers:
[
'facebook'
])
oauth_user
.
save
expect
(
gl_user
).
to
be_valid
expect
(
gl_user
.
external
).
to
be_falsey
expect
(
gl_user
.
external
).
to
be_truthy
end
end
context
'provider is not external'
do
context
'when adding a new OAuth identity'
do
it
'should not promote an external user to internal'
do
user
=
create
(
:user
,
email:
'john@mail.com'
,
external:
true
)
user
.
identities
.
create
(
provider:
provider
,
extern_uid:
uid
)
oauth_user
.
save
expect
(
gl_user
).
to
be_valid
expect
(
gl_user
.
external
).
to
be_truthy
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/models/concerns/mentionable_spec.rb
View file @
fd2b2dc1
...
...
@@ -29,6 +29,43 @@ describe Issue, "Mentionable" do
it
{
is_expected
.
not_to
include
(
user2
)
}
end
describe
'#referenced_mentionables'
do
context
'with an issue on a private project'
do
let
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:public_issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:private_project
)
{
create
(
:empty_project
,
:private
)
}
let
(
:private_issue
)
{
create
(
:issue
,
project:
private_project
)
}
let
(
:user
)
{
create
(
:user
)
}
def
referenced_issues
(
current_user
)
text
=
"
#{
private_issue
.
to_reference
(
project
)
}
and
#{
public_issue
.
to_reference
}
"
issue
.
referenced_mentionables
(
current_user
,
text
)
end
context
'when the current user can see the issue'
do
before
{
private_project
.
team
<<
[
user
,
Gitlab
::
Access
::
DEVELOPER
]
}
it
'includes the reference'
do
expect
(
referenced_issues
(
user
)).
to
contain_exactly
(
private_issue
,
public_issue
)
end
end
context
'when the current user cannot see the issue'
do
it
'does not include the reference'
do
expect
(
referenced_issues
(
user
)).
to
contain_exactly
(
public_issue
)
end
end
context
'when there is no current user'
do
it
'does not include the reference'
do
expect
(
referenced_issues
(
nil
)).
to
contain_exactly
(
public_issue
)
end
end
end
end
describe
'#create_cross_references!'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:author
)
{
double
(
'author'
)
}
...
...
This diff is collapsed.
Click to expand it.
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