Commit Graph

50 Commits

Author SHA1 Message Date
GitLab Bot faf60c19a9 Add latest changes from gitlab-org/gitlab@master 2023-12-20 21:16:25 +00:00
GitLab Bot 054c9f71bc Add latest changes from gitlab-org/gitlab@master 2023-12-20 18:11:16 +00:00
GitLab Bot 27272e0696 Add latest changes from gitlab-org/gitlab@master 2023-12-20 00:10:18 +00:00
GitLab Bot c4fad7502e Add latest changes from gitlab-org/gitlab@master 2023-12-14 00:08:01 +00:00
GitLab Bot 2308cd5020 Add latest changes from gitlab-org/gitlab@master 2023-11-08 18:11:30 +00:00
GitLab Bot 5f89187f04 Add latest changes from gitlab-org/gitlab@master 2023-11-08 12:12:37 +00:00
GitLab Bot a85b67d51a Add latest changes from gitlab-org/gitlab@master 2023-10-25 03:11:36 +00:00
GitLab Bot d87800c3cf Add latest changes from gitlab-org/gitlab@master 2023-06-16 12:07:11 +00:00
GitLab Bot 2f1a81fd16 Add latest changes from gitlab-org/gitlab@master 2023-06-05 18:09:44 +00:00
GitLab Bot 4564f677f8 Add latest changes from gitlab-org/gitlab@master 2023-05-11 15:08:39 +00:00
GitLab Bot 4e9ceea7f8 Add latest changes from gitlab-org/gitlab@master 2023-05-10 15:13:04 +00:00
GitLab Bot 7db94a9807 Add latest changes from gitlab-org/gitlab@master 2023-05-08 21:15:10 +00:00
GitLab Bot de0e57e387 Add latest changes from gitlab-org/gitlab@master 2023-03-22 18:15:17 +00:00
GitLab Bot 3612694ce3 Add latest changes from gitlab-org/gitlab@master 2023-03-14 06:13:49 +00:00
GitLab Bot 14a32c2d55 Add latest changes from gitlab-org/gitlab@master 2023-03-03 12:10:00 +00:00
GitLab Bot cbb9c704ee Add latest changes from gitlab-org/gitlab@master 2023-01-07 00:09:52 +00:00
GitLab Bot ca3ff7f842 Add latest changes from gitlab-org/gitlab@master 2022-10-06 21:09:01 +00:00
GitLab Bot ce5c259086 Add latest changes from gitlab-org/gitlab@master 2022-08-19 21:11:26 +00:00
GitLab Bot 4c083c8163 Add latest changes from gitlab-org/gitlab@master 2022-08-19 15:11:58 +00:00
GitLab Bot f44215bf40 Add latest changes from gitlab-org/gitlab@master 2022-07-21 12:10:03 +00:00
GitLab Bot dbfedde341 Add latest changes from gitlab-org/gitlab@master 2022-06-16 18:09:35 +00:00
GitLab Bot 842ac3526c Add latest changes from gitlab-org/gitlab@master 2022-04-08 18:08:29 +00:00
GitLab Bot 32bbedbc21 Add latest changes from gitlab-org/gitlab@master 2022-03-31 21:08:16 +00:00
GitLab Bot 70c5d79282 Add latest changes from gitlab-org/gitlab@master 2022-02-17 12:12:30 +00:00
GitLab Bot 53716bea26 Add latest changes from gitlab-org/gitlab@master 2022-01-10 15:14:26 +00:00
GitLab Bot ca2eb5b26a Add latest changes from gitlab-org/gitlab@master 2021-08-18 00:11:18 +00:00
GitLab Bot 90755d1898 Add latest changes from gitlab-org/gitlab@master 2021-05-31 21:09:39 +00:00
GitLab Bot 0ae8428c8e Add latest changes from gitlab-org/gitlab@master 2021-05-11 21:10:21 +00:00
GitLab Bot 07116000f2 Add latest changes from gitlab-org/gitlab@master 2020-12-11 03:09:40 +00:00
GitLab Bot 7b2635a55d Add latest changes from gitlab-org/gitlab@master 2020-12-01 12:09:17 +00:00
GitLab Bot a865379008 Add latest changes from gitlab-org/gitlab@master 2020-09-07 12:08:27 +00:00
GitLab Bot c787c1559e Add latest changes from gitlab-org/gitlab@master 2020-08-13 18:10:36 +00:00
GitLab Bot 44a9f0d5c8 Add latest changes from gitlab-org/gitlab@master 2020-06-10 00:08:55 +00:00
GitLab Bot c4c1fc5fe7 Add latest changes from gitlab-org/gitlab@master 2020-05-15 15:08:04 +00:00
GitLab Bot 286fe61013 Add latest changes from gitlab-org/gitlab@master 2020-03-13 12:09:22 +00:00
GitLab Bot 664c4c7b49 Add latest changes from gitlab-org/gitlab@master 2019-10-21 12:06:14 +00:00
Małgorzata Ksionek 48bb855ece
Add checking for email_verified key
Fix rubocop offences and add changelog

Add email_verified key for feature specs

Add code review remarks

Add code review remarks

Fix specs
2019-09-30 14:22:05 +02:00
GitLab Bot 5707f305f4 Add latest changes from gitlab-org/gitlab@master 2019-09-26 12:06:00 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Thong Kuah f0391c2517 Add frozen_string_literal to spec/support
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-25 17:33:34 +12:00
James Edwards-Jones efde6f7db9 OmniAuth full_host spec helper
Allows us to correctly set omniauth's full_host
so redirects take the port into account.

Needed when running selenium tests on a different port
2019-07-04 08:53:31 +00:00
Rémy Coutable a16d7e414d
Revert Rails.application.env_config after using mock_auth_hash
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-23 21:11:08 +02:00
Yorick Peterse 040e6e72bf Merge branch 'ce-security-jej/group-saml-link-origin-verification' into 'master'
Ensure request to link GroupSAML acount was GitLab initiated

See merge request gitlab/gitlabhq!2976
2019-03-04 18:36:26 +00:00
Rémy Coutable 3a2abc1d50
Enable the Layout/ExtraSpacing cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
James Edwards-Jones 104c8b890d Backport EE GroupSAML origin verification changes 2019-01-23 19:42:16 +00:00
Roger Rüttimann 2efe27ba18 Honor saml assurance level to allow 2FA bypassing 2018-06-25 15:32:03 +00:00
Robert Speicher 73ade323c8
Make the stubbed methods for SAML authorize paths more specific
Globally stubbing any instance of `Object` seems like a very bad idea,
and it led to test failures here:

- https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/76025159
- https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/76024972
2018-06-19 15:45:39 -05:00
James Edwards-Jones b98a88cfe9 Backport helpers from GroupSAML failure messages 2018-05-21 16:43:12 +01:00
Douwe Maan 1e624f3401 Merge branch 'jej/refactor-omniauth-controller' into 'master'
Refactor OmniauthCallbacksController to remove duplication

Closes #26559

See merge request gitlab-org/gitlab-ce!16694
2018-04-24 10:18:10 +00:00
Rémy Coutable 023d4f6f2f
Move spec helpers/matchers/shared examples/contexts to their relevant folder
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-23 12:20:30 +02:00