6744162376
Add latest changes from gitlab-org/gitlab@master
2020-06-15 12:08:44 +00:00
94bb660460
Add frozen_string_literal to spec/factories
...
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:18:39 +12:00
7044a3a54a
Validate SSH keys through the sshkey gem
2018-02-16 11:32:08 -05:00
75fd832454
Revert "Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'"
...
This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
2018-02-15 09:50:19 -05:00
740499bab5
Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'"
...
This reverts commit a58f8c32c6cd5d75c362
2018-02-12 12:39:47 -05:00
972f564dcd
Sanitize extra blank spaces used when uploading a SSH key
2018-02-01 17:00:16 -05:00
536a47b4b7
Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
...
[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`
See merge request gitlab/gitlabhq!2276
(cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c)
1f2bd3c0 Backport to 10.3
2018-01-16 17:04:51 -08:00
e24e0c90a3
Use heredoc for long strings so it's easier to read
2018-01-03 22:08:03 +08:00
4af9d592c5
Replace factory_girl_rails with factory_bot_rails
...
I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md ) and ran these two commands:
```
grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|"
grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|"
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-14 15:01:55 +01:00
b0f982fbdf
Add settings for minimum key strength and allowed key type
...
This is an amalgamation of:
* Cory Hinshaw: Initial implementation !5552
* Rémy Coutable: Updates !9350
* Nick Thomas: Resolve conflicts and add ED25519 support !13712
2017-08-30 20:50:44 +01:00
857d039145
Lint our factories creation in addition to their build
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-02 19:06:50 +02:00
4865a7ab92
Enable creation of deploy keys with write access via the API
...
* Documentation was incorrectly advertising the missing param
2017-04-05 16:22:28 +10:00
e31b982a13
Make deploy key not show in User's keys list
2017-02-13 15:38:00 +01:00
6df45eb463
Move all factory definitions to their own file
2016-03-04 15:26:51 -05:00
GitLab Bot