Commit Graph

44 Commits

Author SHA1 Message Date
GitLab Bot f33e404bda Add latest changes from gitlab-org/gitlab@master 2024-02-21 18:07:23 +00:00
GitLab Bot 808b8561f4 Add latest changes from gitlab-org/gitlab@master 2024-01-04 21:07:37 +00:00
GitLab Bot df52f8c8af Add latest changes from gitlab-org/gitlab@master 2023-06-02 21:10:20 +00:00
GitLab Bot 5b62f8e3ee Add latest changes from gitlab-org/gitlab@master 2023-04-14 18:08:53 +00:00
GitLab Bot ccab6fb4df Add latest changes from gitlab-org/gitlab@master 2023-03-31 15:08:50 +00:00
GitLab Bot b48bbc842d Add latest changes from gitlab-org/gitlab@master 2023-03-30 18:10:57 +00:00
GitLab Bot 70e8b38340 Add latest changes from gitlab-org/gitlab@master 2023-03-30 00:08:32 +00:00
GitLab Bot 3fa33c82f9 Add latest changes from gitlab-org/gitlab@master 2023-03-28 12:08:19 +00:00
GitLab Bot 5fe2d74e00 Add latest changes from gitlab-org/gitlab@master 2022-12-09 09:08:55 +00:00
GitLab Bot e55fd66eae Add latest changes from gitlab-org/gitlab@master 2021-11-02 06:10:00 +00:00
GitLab Bot a46b489e17 Add latest changes from gitlab-org/gitlab@master 2021-03-24 12:09:32 +00:00
GitLab Bot bdca097916 Add latest changes from gitlab-org/gitlab@master 2020-08-11 03:11:00 +00:00
GitLab Bot fa7ac2663b Add latest changes from gitlab-org/gitlab@master 2020-06-24 06:09:01 +00:00
GitLab Bot 7105e0c53e Add latest changes from gitlab-org/gitlab@master 2020-06-22 18:08:47 +00:00
GitLab Bot 3caf5a8a00 Add latest changes from gitlab-org/gitlab@master 2020-06-15 18:08:43 +00:00
GitLab Bot abae8f34f3 Add latest changes from gitlab-org/gitlab@master 2020-03-31 21:08:05 +00:00
GitLab Bot 2a040e2655 Add latest changes from gitlab-org/gitlab@master 2020-02-21 12:09:07 +00:00
GitLab Bot abfafe3c57 Add latest changes from gitlab-org/gitlab@master 2019-10-29 00:06:10 +00:00
GitLab Bot b7e6df1abd Add latest changes from gitlab-org/gitlab@master 2019-10-17 00:07:27 +00:00
blackst0ne b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
Douwe Maan 739029bb0f
Fix API to remove deploy key from project instead of deleting it entirely 2018-05-04 12:41:53 +02:00
Douwe Maan 59d910f2a1 Set user when adding deploy key to project using API 2018-03-28 18:53:52 +02:00
Douwe Maan 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
Jacopo 2f40dac352 Refactor `have_http_status` into `have_gitlab_http_status` in the specs 2017-10-20 10:13:18 +02:00
Robert Schilling 915dd57fe2 Add tests for the unmodified header 2017-08-28 17:10:34 +02:00
Rémy Coutable c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 11:52:22 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Alexander Randa c7bcebd56e Fix edit button for deploy keys available from other projects 2017-06-20 11:23:13 +00:00
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Alexander Randa 3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03:00
Jacopo ff76adb547 Unnecessary "include WaitForAjax" and "include ApiHelpers"
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
2017-04-21 22:32:02 +02:00
Mark Fletcher 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
Robert Schilling 86c58687b2 Return 204 for delete endpoints 2017-02-28 08:32:38 +01:00
Robert Schilling e7551214f3 API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable` 2017-02-20 09:33:42 +01:00
Robert Schilling c70dfbc686 Add a custom pagination matcher 2017-02-16 15:38:40 +01:00
Robert Schilling 18417c9ee8 Grapify all endpoints of the deploy keys API 2017-01-23 17:06:57 +01:00
Rémy Coutable 9c560b5cdf
Replace many :project with :empty_projects in API specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-17 11:41:27 -05:00
Rémy Coutable 4e249d5bae
Use :maximum instead of :within for length validators with a 0..N range
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-06 10:23:17 +01:00
Livier eb4f15571d Changed API spec files to describe the correct class
Restore changes for api spec files

Fix error in rspec Users

Delete extra space Repositories-spec
2016-11-28 10:55:27 -07:00
Joshua Welsh ce4760bbd5
Fixes various errors when adding deploy keys caused by not exiting the control flow.
When adding a deploy key that already exists in the project the existing key would not be returned, resulting in an attempt to create a new one, which in turn caused a 500 error due to an ActiveRecord exception.

When adding a deploy key that exists within another project the key would be joined to the project, but would also attempt to create a new one, which resulted in a 400 error due to the key already existing.

Fixes #22741
Fixes #21754

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-26 12:54:47 +02:00
Z.J. van de Weg 554e18ab02 Create service for enabling deploy keys 2016-08-05 11:38:17 +02:00
Z.J. van de Weg 460065b743 Move deploy_key tests to deploy_key_spec.rb
Also, fix the failing test in the process
2016-08-04 16:55:20 +02:00
Z.J. van de Weg 2b6bd6a33f Use Grape DSL for deploy keys endpoints
Also a minor clean up of the post endpoint
2016-08-03 21:04:14 +02:00
Z.J. van de Weg da3d3ba89c Endpoints to enable and disable deploy keys
Resolves #20123
2016-08-03 16:00:22 +02:00