diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 15:09:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 15:09:42 +0300 |
| commit | 403678e00406edc8094f087ec70e00aa29e49bef (patch) | |
| tree | 447d6d4967e9a11895683b27e637a50bd9fc0602 /lib/api | |
| parent | f5050253469fc0961c02deec0e698ad62bdd9de5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/api.rb | 1 | ||||
| -rw-r--r-- | lib/api/helpers/projects_helpers.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index cf6e7f18a5f..eb7f47de9e2 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -28,6 +28,7 @@ module API ] allow_access_with_scope :api + allow_access_with_scope :read_api, if: -> (request) { request.get? } prefix :api version 'v3', using: :path do diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb index cedf50aaff6..8ad682fc961 100644 --- a/lib/api/helpers/projects_helpers.rb +++ b/lib/api/helpers/projects_helpers.rb @@ -129,6 +129,7 @@ module API :avatar, :suggestion_commit_message, :repository_storage, + :compliance_framework_setting, # TODO: remove in API v5, replaced by *_access_level :issues_enabled, |