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
ff6f0ada
Commit
ff6f0ada
authored
Aug 15, 2016
by
Patricio Cano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added documentation and CHANGELOG item
parent
e2f9c876
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
5 deletions
+6
-5
CHANGELOG
CHANGELOG
+1
-0
app/services/user_retrieval_service.rb
app/services/user_retrieval_service.rb
+1
-1
doc/api/oauth2.md
doc/api/oauth2.md
+1
-1
doc/api/session.md
doc/api/session.md
+1
-1
spec/requests/api/oauth_tokens_spec.rb
spec/requests/api/oauth_tokens_spec.rb
+1
-1
spec/services/user_retrieval_service_spec.rb
spec/services/user_retrieval_service_spec.rb
+1
-1
No files found.
CHANGELOG
View file @
ff6f0ada
...
@@ -51,6 +51,7 @@ v 8.11.0 (unreleased)
...
@@ -51,6 +51,7 @@ v 8.11.0 (unreleased)
- Get issue and merge request description templates from repositories
- Get issue and merge request description templates from repositories
- Add hover state to todos !5361 (winniehell)
- Add hover state to todos !5361 (winniehell)
- Fix icon alignment of star and fork buttons !5451 (winniehell)
- Fix icon alignment of star and fork buttons !5451 (winniehell)
- Enforce 2FA restrictions on API authentication endpoints !5820
- Limit git rev-list output count to one in forced push check
- Limit git rev-list output count to one in forced push check
- Show deployment status on merge requests with external URLs
- Show deployment status on merge requests with external URLs
- Clean up unused routes (Josef Strzibny)
- Clean up unused routes (Josef Strzibny)
...
...
app/services/user_retrieval_service.rb
View file @
ff6f0ada
...
@@ -10,4 +10,4 @@ class UserRetrievalService
...
@@ -10,4 +10,4 @@ class UserRetrievalService
user
=
Gitlab
::
Auth
.
find_with_user_password
(
login
,
password
)
user
=
Gitlab
::
Auth
.
find_with_user_password
(
login
,
password
)
user
unless
user
.
two_factor_enabled?
user
unless
user
.
two_factor_enabled?
end
end
end
end
\ No newline at end of file
doc/api/oauth2.md
View file @
ff6f0ada
...
@@ -90,7 +90,7 @@ curl --header "Authorization: Bearer OAUTH-TOKEN" https://localhost:3000/api/v3/
...
@@ -90,7 +90,7 @@ curl --header "Authorization: Bearer OAUTH-TOKEN" https://localhost:3000/api/v3/
## Deprecation Notice
## Deprecation Notice
1.
Starting in GitLab
9.0, the Resource Owner Password Credentials will be
*disabled*
for users with two-factor authentication turned on.
1.
Starting in GitLab
8.11, the Resource Owner Password Credentials has been
*disabled*
for users with two-factor authentication turned on.
2.
These users can access the API using [personal access tokens] instead.
2.
These users can access the API using [personal access tokens] instead.
---
---
...
...
doc/api/session.md
View file @
ff6f0ada
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
## Deprecation Notice
## Deprecation Notice
1.
Starting in GitLab
9.0, this feature will be
*disabled*
for users with two-factor authentication turned on.
1.
Starting in GitLab
8.11, this feature has been
*disabled*
for users with two-factor authentication turned on.
2.
These users can access the API using [personal access tokens] instead.
2.
These users can access the API using [personal access tokens] instead.
---
---
...
...
spec/requests/api/oauth_tokens_spec.rb
View file @
ff6f0ada
...
@@ -28,4 +28,4 @@ describe API::API, api: true do
...
@@ -28,4 +28,4 @@ describe API::API, api: true do
end
end
end
end
end
end
end
end
\ No newline at end of file
spec/services/user_retrieval_service_spec.rb
View file @
ff6f0ada
...
@@ -16,4 +16,4 @@ describe UserRetrievalService, services: true do
...
@@ -16,4 +16,4 @@ describe UserRetrievalService, services: true do
expect
(
retrieved_user
).
to
be_nil
expect
(
retrieved_user
).
to
be_nil
end
end
end
end
end
end
\ No newline at end of file
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