diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-18 23:44:19 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-18 23:44:19 +0300 |
| commit | 2dac058de25dc6ed03d0ed6f8b099aa17cdc1cab (patch) | |
| tree | e257120e671ef51a6256d618aa02e0d1f8432199 /lib | |
| parent | 73ecfae93508477f3cfe77b7ad1a325b085004d8 (diff) | |
| parent | 22d8f934ef2ca3ac57524f2345a016e2fe935799 (diff) | |
Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'
Remove EE-specific lines from Plan concerns
See merge request gitlab-org/gitlab-ce!21448
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/protected_branches.rb | 4 | ||||
| -rw-r--r-- | lib/api/protected_tags.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb index e569fad8663..804f6fa9b73 100644 --- a/lib/api/protected_branches.rb +++ b/lib/api/protected_branches.rb @@ -44,10 +44,10 @@ module API params do requires :name, type: String, desc: 'The name of the protected branch' optional :push_access_level, type: Integer, - values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS, + values: ProtectedBranch::PushAccessLevel.allowed_access_levels, desc: 'Access levels allowed to push (defaults: `40`, maintainer access level)' optional :merge_access_level, type: Integer, - values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS, + values: ProtectedBranch::MergeAccessLevel.allowed_access_levels, desc: 'Access levels allowed to merge (defaults: `40`, maintainer access level)' end # rubocop: disable CodeReuse/ActiveRecord diff --git a/lib/api/protected_tags.rb b/lib/api/protected_tags.rb index 219d51a2bc5..e406344e42d 100644 --- a/lib/api/protected_tags.rb +++ b/lib/api/protected_tags.rb @@ -47,7 +47,7 @@ module API params do requires :name, type: String, desc: 'The name of the protected tag' optional :create_access_level, type: Integer, default: Gitlab::Access::MAINTAINER, - values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS, + values: ProtectedTag::CreateAccessLevel.allowed_access_levels, desc: 'Access levels allowed to create (defaults: `40`, maintainer access level)' end post ':id/protected_tags' do |