summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-07-01 17:34:00 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-07-01 17:34:00 +0800
commit08070c76952a27e4710fb9f2c800e71a84fc72c7 (patch)
tree3a89d90ff9a982afb502400561a6450e570fa74d /lib/api/entities.rb
parent63477fd27f3eeff5d5f612b27ed71c76926934d2 (diff)
parentab81ea1e8177742a0dfed2c7cf922bb03a8b6c51 (diff)
downloadgitlab-ce-08070c76952a27e4710fb9f2c800e71a84fc72c7.tar.gz
Merge remote-tracking branch 'upstream/master' into enable-shared-runners-with-admins
* upstream/master: (120 commits) Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9. Remove additional entries from CHANGELOG Catch permission denied errors and ignore the disk Remove coveralls lines Make GH one-off auth the default again for importing GH projects Import from Github using Personal Access Tokens. Remove hardcoded gitlab-shell version in test env now that the required tag is published Updated breakpoint for sidebar pinning Expire branch/tag git data when needed. Remove unnecessary parens Enable Style/UnneededCapitalW Rubocop cop Expiry date on pinned nav cookie Fix broken spec in git_push_service_spec by stubbing an external issue tracker Handle external issues in IssueReferenceFilter Move Changelog entry for build retry fix to 8.9.4 Add Changelog entry for build sidebar retry link fix Improve method that tells if build is retryable Do not show build retry link when build is active Remove coveralls as its unused Move changelot item "Add sub nav to file page view" to 8.9.4 ...
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5a23a18fe9c..4e2a43e45e2 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -376,6 +376,7 @@ module API
expose :user_oauth_applications
expose :after_sign_out_path
expose :container_registry_token_expire_delay
+ expose :repository_storage
end
class Release < Grape::Entity