Commit Graph

23 Commits

Author SHA1 Message Date
GitLab Bot f52b15b639 Add latest changes from gitlab-org/gitlab@master 2022-05-26 18:08:09 +00:00
GitLab Bot 67fa8362ae Add latest changes from gitlab-org/gitlab@master 2022-05-06 15:09:03 +00:00
GitLab Bot 474f24bf3b Add latest changes from gitlab-org/gitlab@master 2022-04-19 03:09:43 +00:00
GitLab Bot 4bf395cded Add latest changes from gitlab-org/gitlab@master 2021-08-03 21:09:39 +00:00
GitLab Bot a1ed241c82 Add latest changes from gitlab-org/gitlab@master 2021-02-03 21:09:17 +00:00
GitLab Bot dc889678d1 Add latest changes from gitlab-org/gitlab@master 2020-03-12 15:09:39 +00:00
GitLab Bot 38149afcf9 Add latest changes from gitlab-org/gitlab@master 2020-02-24 09:08:51 +00: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 3b8b38fb0f If `omniauth_auto_sign_in_with_provider` is set,
it also means we're using omniauth, so we need to set it up.
2018-07-02 16:46:24 +08:00
Lin Jen-Shin 1e2b6cf514 Introduce Gitlab::Auth.omniauth_setup_providers
Which could extend from EE
2018-06-01 14:30:10 +08:00
Lin Jen-Shin 39b6f31c66 Eliminate constants warnings by:
* Replace `require` or `require_relative` with `require_dependency`
* Remove unneeded `autoload`
2018-06-01 13:46:46 +08:00
Tiago Botelho 699ecad78c Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite 2018-04-26 10:13:29 +01:00
Horatiu Eugen Vlad 1ad5df49b1 Moved o_auth/saml/ldap modules under gitlab/auth 2018-02-28 16:53:02 +01:00
Jacopo 181cd299f9 Adds Rubocop rule for line break after guard clause
Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
2017-11-16 17:58:29 +01:00
Bob Van Landuyt f8865e9c13 Define ldap methods at runtime
This avoids loading the `OmniAuthCallbacksController` at boot time so
it doesn't mess up the `before_action`-chain
2017-08-24 17:33:53 +02:00
Rubén Dávila ef97cb54ae Backport some recent changes related to LDAP from EE 2017-07-27 08:45:16 -05:00
blackst0ne cc3a82bc8b Add `rescue false`. 2017-07-26 11:05:44 +02:00
blackst0ne 8ce8b21f67 Refactor CSRF protection 2017-07-26 11:05:44 +02:00
Rémy Coutable c5e34da01d
Remove explicit `require` calls, and use `require_dependency` when needed
See
http://guides.rubyonrails.org/autoloading_and_reloading_constants.html
for more info.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-13 14:29:55 +01:00
Douglas Barbosa Alexandre a2ef52b32b Add custom OmniAuth strategy for Bitbucket OAuth2 2016-11-21 16:47:24 -08:00
Felipe Artur 56f3b243ce Add leading comment space cop 2016-05-31 19:33:46 -03:00
Douwe Maan 41a4785b85 Fix signin with OmniAuth providers 2015-12-08 14:58:15 +01:00
Douwe Maan 843694f902 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-08-26 17:53:31 -07:00