Commit Graph

58 Commits

Author SHA1 Message Date
GitLab Bot 20625a2433 Add latest changes from gitlab-org/gitlab@master 2024-10-09 21:14:51 +00:00
GitLab Bot a4cfb7653b Add latest changes from gitlab-org/gitlab@master 2024-07-17 15:24:19 +00:00
GitLab Bot 7f0fd430c2 Add latest changes from gitlab-org/gitlab@master 2024-05-29 15:12:58 +00:00
GitLab Bot f33e404bda Add latest changes from gitlab-org/gitlab@master 2024-02-21 18:07:23 +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 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 48b4860d60 Add latest changes from gitlab-org/gitlab@master 2022-11-11 03:08:03 +00:00
GitLab Bot 71d6b9014b Add latest changes from gitlab-org/gitlab@master 2022-10-28 21:10:45 +00:00
GitLab Bot e4220eecca Add latest changes from gitlab-org/gitlab@master 2022-10-18 18:09:22 +00:00
GitLab Bot 4ef4c552f3 Add latest changes from gitlab-org/gitlab@master 2022-04-29 12:10:13 +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 5a7d44a955 Add latest changes from gitlab-org/gitlab@master 2020-10-29 12:08:50 +00:00
GitLab Bot 6a0085290e Add latest changes from gitlab-org/gitlab@master 2020-10-15 00:08:42 +00:00
GitLab Bot 777f6da99a Add latest changes from gitlab-org/gitlab@master 2020-06-29 21:09:07 +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 2e4d8b3449 Add latest changes from gitlab-org/gitlab@master 2020-04-28 03:09:53 +00:00
GitLab Bot f569792df8 Add latest changes from gitlab-org/gitlab@master 2020-04-27 18:09:41 +00:00
GitLab Bot b7e6df1abd Add latest changes from gitlab-org/gitlab@master 2019-10-17 00:07:27 +00:00
Imre Farkas b1e070bf49
Fix API::Namespaces to accept namepaces with dots
It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to
API::NAMESPACE_OR_PROJECT_REQUIREMENTS
2018-11-28 12:54:11 +01:00
gfyoung 3836d69119 Enable frozen string in lib/api and lib/backup
Partially addresses #47424.

Had to make changes to spec files because
stubbing methods on frozen objects is a mess
in RSpec and leads to failures:

https://github.com/rspec/rspec-mocks/issues/1190
2018-09-29 21:04:50 -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
Lin Jen-Shin 4ee08b77bc Updates from `rubocop -a` 2018-07-09 21:13:08 +08: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
Oswaldo Ferreira d1eb3ff594 Make ruby lint happy 2018-01-17 11:42:32 -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
Robert Schilling 6a2ee0968e API: Use defined project requirements 2017-08-31 14:57:47 +02:00
Robert Schilling e80313f9ee Conditionally destroy a ressource 2017-08-28 16:40:25 +02:00
Robert Schilling 998afa5f74 API: Respect the 'If-Unmodified-Since' for delete endpoints 2017-08-28 16:40:25 +02:00
Dmitriy Zaporozhets 6b8ad689da
Update grape gem
New version of the gem returns 200 status code on delete with content
instead of 204 so we explicitly set status code to keep existing
behavior

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-20 16:33:18 +03:00
Alexander Randa c7bcebd56e Fix edit button for deploy keys available from other projects 2017-06-20 11:23:13 +00:00
Alexander Randa 3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03: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
Rémy Coutable 63360adeae
Add `requirements: { id: %r{[^/]+} }` for all projects and groups namespaced API routes
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-16 18:00:24 +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 01ea65e0e9 Paginate all endpoints that return an array 2017-02-16 15:32:01 +01:00
Robert Schilling 67f5522d2e Remove /projects/:id/keys/.. endpoints 2017-02-07 14:14:15 +01:00
Rémy Coutable 01fa19edfe Merge branch 'grapify-deploy-keys' into 'master'
Grapify all endpoints of the deploy keys API

See merge request !8721
2017-01-24 12:45:09 +00:00
Robert Speicher 60d1dcb83a Merge branch 'fix-users-deleting-public-deployment-keys' into 'security'
Fix users being able to delete instance public deployment keys

See merge request !2049
2017-01-23 13:41:58 -05:00
Robert Schilling 18417c9ee8 Grapify all endpoints of the deploy keys API 2017-01-23 17:06:57 +01:00
Robert Schilling 76bd09326f Use declared_params helper in API 2016-11-14 15:22:06 +01: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 7e47a82899 Namespace EnableDeployKeyService under Projects 2016-08-08 20:59:51 +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