diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-04 22:37:44 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-04 22:37:44 +0800 |
commit | fb9a0e5277f9825d7faf991c0600a7247b268fe8 (patch) | |
tree | 35000cd71ebf5de840c2c931d2f1c7a9b7357dad /lib/api/entities.rb | |
parent | ce1dc4c25d3464b7a9a1b21d93157c9fed98f705 (diff) | |
parent | 5368b9f249485e254a90fe7daa551d61412bee26 (diff) | |
download | gitlab-ce-fb9a0e5277f9825d7faf991c0600a7247b268fe8.tar.gz |
Merge remote-tracking branch 'upstream/master' into show-status-from-branch
* upstream/master: (35 commits)
Only skip group when it's actually a group in the "Share with group" select
Fix: Todos Filter Shows All Users
Fix: Guest sees some repository details and gets 404
Move shared params to a helper
GrapeDSL for project hooks
Update commits.scss
updated styling commit SHA on branches page + added to changelog
change build list height to show 6,5 builds + improve padding of list, with first/last child selectors
Ignore builds directory from eslint
Add changelog entry
Document multiple repository storage paths
Allow multiple repository storage shards to be enabled, and automatically round-robin between them
Cleaned up global namespace JS
Add tip for using Chrome to run and debug teaspoon tests.
Add CHANGELOG entry file
Add jquery.timeago.js to application.js
Update match-regex to fix filename convention
Move jquery.timeago to vendor directory
Change a bunch of doc links to either relative or https://docs.gitlab.com.
Show log corresponding to env in admin/logs
...
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 d52496451a2..1f378ba1635 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -509,6 +509,7 @@ module API expose :after_sign_out_path expose :container_registry_token_expire_delay expose :repository_storage + expose :repository_storages expose :koding_enabled expose :koding_url end |