Commit Graph

47 Commits

Author SHA1 Message Date
GitLab Bot 43a25d93eb Add latest changes from gitlab-org/gitlab@16-0-stable-ee 2023-05-17 16:05:49 +00:00
GitLab Bot 71786ddc8e Add latest changes from gitlab-org/gitlab@15-9-stable-ee 2023-02-20 13:49:51 +00:00
GitLab Bot 05f0ebba3a Add latest changes from gitlab-org/gitlab@15-8-stable-ee 2023-01-18 19:00:14 +00:00
GitLab Bot ee664acb35 Add latest changes from gitlab-org/gitlab@15-5-stable-ee 2022-10-20 09:40:42 +00:00
GitLab Bot 6ed4ec3e0b Add latest changes from gitlab-org/gitlab@15-4-stable-ee 2022-09-19 23:18:09 +00:00
GitLab Bot b39512ed75 Add latest changes from gitlab-org/gitlab@15-3-stable-ee 2022-08-18 08:17:02 +00:00
GitLab Bot 0ea3fcec39 Add latest changes from gitlab-org/gitlab@15-1-stable-ee 2022-06-20 11:10:13 +00:00
GitLab Bot 3cccd102ba Add latest changes from gitlab-org/gitlab@14-10-stable-ee 2022-04-20 10:00:54 +00:00
GitLab Bot d111c2d301 Add latest changes from gitlab-org/security/gitlab@14-9-stable-ee 2022-03-30 13:54:01 +00:00
GitLab Bot 41fe97390c Add latest changes from gitlab-org/gitlab@14-9-stable-ee 2022-03-18 20:02:30 +00:00
GitLab Bot edaa33dee2 Add latest changes from gitlab-org/gitlab@14-7-stable-ee 2022-01-20 09:16:11 +00:00
GitLab Bot 311b0269b4 Add latest changes from gitlab-org/gitlab@14-5-stable-ee 2021-11-18 13:16:36 +00:00
GitLab Bot 0653e08efd Add latest changes from gitlab-org/gitlab@14-3-stable-ee 2021-09-20 13:18:24 +00:00
GitLab Bot a5f4bba440 Add latest changes from gitlab-org/gitlab@14-0-stable-ee 2021-06-16 18:25:58 +00:00
GitLab Bot 4555e1b21c Add latest changes from gitlab-org/gitlab@13-12-stable-ee 2021-05-19 15:44:42 +00:00
GitLab Bot f64a639bcf Add latest changes from gitlab-org/gitlab@13-10-stable-ee 2021-03-16 18:18:33 +00:00
GitLab Bot 8b573c9489 Add latest changes from gitlab-org/gitlab@13-7-stable-ee 2020-12-17 11:59:07 +00:00
GitLab Bot 85dc423f70 Add latest changes from gitlab-org/gitlab@13-4-stable-ee 2020-09-19 01:45:44 +00:00
GitLab Bot 6e4e1050d9 Add latest changes from gitlab-org/gitlab@13-3-stable-ee 2020-08-20 18:42:06 +00:00
GitLab Bot 8c7f4e9d5f Add latest changes from gitlab-org/gitlab@13-1-stable-ee 2020-06-18 11:18:50 +00:00
GitLab Bot 9f46488805 Add latest changes from gitlab-org/gitlab@13-0-stable-ee 2020-05-20 14:34:42 +00:00
GitLab Bot dc889678d1 Add latest changes from gitlab-org/gitlab@master 2020-03-12 15:09:39 +00:00
GitLab Bot d3c29eae5c Add latest changes from gitlab-org/gitlab@master 2020-03-05 21:08:13 +00:00
GitLab Bot f1e2fca19a Add latest changes from gitlab-org/gitlab@master 2020-03-03 12:08:08 +00:00
GitLab Bot 0012439861 Add latest changes from gitlab-org/gitlab@master 2020-01-22 09:08:39 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
dodocat 6e2032f24e Update docs and comments about saml with allow_bypass_two_factor
allow_bypass_two_factor configration dose not work with saml provider
2019-08-27 03:46:32 +00:00
Thong Kuah d4ef3be35b Frozen string cannot change encoding
This was shown in specs but surely this will be happening in application
code as well if this method is passes a frozen string.

We were also trying to force_encode a OmniAuth::AuthHash which had the
very confusing behaviour of returning nil when it was sent a method that
it did not define. Fix that by only force_encoding a String.
2019-07-26 00:13:25 +12:00
Kartikey Tanna 53af3e6b9e #57815 Password authentication disabled for UltraAuth users
Disabled password authentication for the users registered using
omniauth-ultraauth strategy
2019-06-18 16:18:14 +00:00
Martin Wortschack 9c95200219 Add no-tabs class and externalize strings
- Add .no-tabs to login-box
- Externalize strings in common signup box
- Leverage render_if_exists
- Update PO file
2019-05-27 13:20:27 +00:00
Rémy Coutable 45da7dd306
Backport 'Update user name upon LDAP sync' from EE
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-25 11:16:01 +01:00
Imre Farkas 157b385411
Log admin status of user when OAuth::User is saved 2019-01-23 14:26:15 +01:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
gfyoung e166e5747c Enable some frozen string in lib/gitlab
Enable frozen string for the following files:

* lib/gitlab/auth/**/*.rb
* lib/gitlab/badge/**/*.rb
* lib/gitlab/bare_repository_import/**/*.rb
* lib/gitlab/bitbucket_import/**/*.rb
* lib/gitlab/bitbucket_server_import/**/*.rb
* lib/gitlab/cache/**/*.rb
* lib/gitlab/checks/**/*.rb

Partially addresses #47424.
2018-10-13 02:31:31 -07:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Stan Hu 7486d424b9 Fix broken Git over HTTP clones with LDAP users
Due to a regression in !20608, the LDAP authenticator was not being used
unless OmniAuth was enabled. This change allows the LDAP provider to be used
if it is configured regardless of the OmniAuth setting.

Closes #50579
2018-08-22 13:07:14 -07:00
Lin Jen-Shin d0afab482f Disable SAML if OmniAuth is disabled
We also try to unify the way we setup OmniAuth, and how we check
if it's enabled or not.
2018-07-20 18:54:46 +08:00
Lin Jen-Shin 4ee08b77bc Updates from `rubocop -a` 2018-07-09 21:13:08 +08:00
Roger Rüttimann 2efe27ba18 Honor saml assurance level to allow 2FA bypassing 2018-06-25 15:32:03 +00:00
James Edwards-Jones dd09a19ad6 Auth::User classes refactor adds should_save? 2018-04-23 16:24:56 +01:00
James Edwards-Jones d3a8a07423 Unify Saml::IdentityLinker and OAuth::IdentityLinker 2018-04-23 13:53:32 +01:00
James Edwards-Jones f8d54913bb Show error on failed OAuth account link 2018-04-22 23:50:56 +01:00
James Edwards-Jones f10c999bca Refactor OmniauthCallbacksController to remove duplication
Moves LDAP to its own controller with tests
Provides path forward for implementing GroupSaml
2018-04-22 23:50:55 +01:00
Francisco Javier López ae84eaeba7 Add better LDAP connection handling 2018-04-04 09:07:28 +00:00
Horatiu Eugen Vlad 7d01792614 Fix LDAP login without user in DB 2018-03-27 09:21:17 +02:00
Horatiu Eugen Vlad 6d3cb7e22e Make oauth provider login generic 2018-03-05 22:26:40 +00:00
Horatiu Eugen Vlad 1ad5df49b1 Moved o_auth/saml/ldap modules under gitlab/auth 2018-02-28 16:53:02 +01:00