Commit Graph

20 Commits

Author SHA1 Message Date
GitLab Bot a89cb5cbdd Add latest changes from gitlab-org/gitlab@master 2020-02-06 21:08:48 +00:00
GitLab Bot 869182cab0 Add latest changes from gitlab-org/gitlab@master 2019-10-09 00:06:06 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Imre Farkas 63e8e2c331 CE port of Move EE specific lines in API::ProtectedBranches 2019-05-29 12:49:56 +00:00
Yorick Peterse 05534daa1c
Backport changes to API::ProtectedBranches
This backports EE specific parameters EE adds to API::ProtectedBranches,
and wraps them in a conditional.
2019-03-26 14:18:29 +01: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
Sean McGivern b3cd850c3f Remove EE-specific code from ProtectedRefAccess 2018-09-17 19:36:53 +08: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
Mark Chao 8c24e78b99 wording 2018-06-06 21:01:43 +09:00
Nick Thomas 96b355dca0 Merge branch 'jej/add-protected-branch-policy' into 'master'
Add protected branch policy

See merge request gitlab-org/gitlab-ce!17982
2018-03-27 14:31:54 +00:00
James Edwards-Jones 3cefa9ea6d ProtectedBranch API omits empty declared params 2018-03-26 14:56:14 +01:00
James Edwards-Jones b6a4c0181b API uses ProtectedBranchPolicy for destroy/create 2018-03-26 10:29:53 +01:00
James Edwards-Jones a47565aa14 Updated grape to `1.0.2` to remove workaround 2018-03-26 01:43:43 +01:00
Mark Fletcher 5a160b05ed Fix protected branches API to accept name parameter with dot 2018-01-19 20:07:44 +00:00
James Edwards-Jones 1d47ae1365 CE backport of ProtectedBranches API changes
In EE we now allow individual users/groups to be set on POST, which required some refactoring.
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3516
2017-12-07 11:58:50 +00:00
James Edwards-Jones d6dd9d712a Fix ProtectedBranch access level validations
Before an access_level was required in EE even when an
it had been set for a user/group.
2017-11-24 13:20:56 +00:00
Robert Schilling dcd4ea473c Update remaining endpoints 2017-08-28 17:10:30 +02:00
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Eric fb5b2d8d0e Extending API for protected branches 2017-08-02 10:16:17 +00:00