diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-09 12:13:58 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-09 12:13:58 -0500 |
| commit | 7ea60fbfc872e5acc0cc444d442958990747c6b3 (patch) | |
| tree | bd4a38293d5d03b5cf3842fab04562fe8b775739 /lib/api/entities.rb | |
| parent | a52c5778bb9d95097cc965539731a2ef846c3ff0 (diff) | |
| parent | 201fb4c7e3f9ab4265f87f548ae22bb4008015c9 (diff) | |
| download | gitlab-ce-7ea60fbfc872e5acc0cc444d442958990747c6b3.tar.gz | |
Merge remote-tracking branch 'dev/master' into 'master'
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 93e1c13c4c5..a9c09ffdb31 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -72,6 +72,7 @@ module API expose :star_count, :forks_count expose :open_issues_count, if: lambda { |project, options| project.issues_enabled? && project.default_issues_tracker? } expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] } + expose :public_builds end class ProjectMember < UserBasic @@ -384,7 +385,7 @@ module API # for downloading of artifacts (see: https://gitlab.com/gitlab-org/gitlab-ce/issues/4255) expose :download_url do |repo_obj, options| if options[:user_can_download_artifacts] - repo_obj.download_url + repo_obj.artifacts_download_url end end expose :commit, with: RepoCommit do |repo_obj, _options| |