diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 11:26:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 11:26:44 +0000 |
| commit | 806c748852e7d62dfa13fd2d039949ce0f875a12 (patch) | |
| tree | ad2142c9c63d3a3aca7d71a048bda460b1767389 /lib/api/entities.rb | |
| parent | a82e3d30b2ef625dae0d2f25324460402f960f09 (diff) | |
| parent | f40403cce1a8185254e74dff54ee687b7953093b (diff) | |
| download | gitlab-ce-api-remove-owned-groups.tar.gz | |
Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groups
# Conflicts:
# doc/api/v3_to_v4.md
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 85aa6932f81..0e37f40a887 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -557,6 +557,7 @@ module API expose :default_project_visibility expose :default_snippet_visibility expose :default_group_visibility + expose :default_artifacts_expire_in expose :domain_whitelist expose :domain_blacklist_enabled expose :domain_blacklist |