diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2016-11-28 19:16:15 +0100 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2016-11-30 13:13:50 +0100 |
| commit | 2ce66c071fc7ab2b8ca881223321a3927ec7d61e (patch) | |
| tree | c172fb1a5112e7579a663313e766b80642568e58 /lib/api/entities.rb | |
| parent | 060ec3d77d3d4a1e81510e07469db411fb66e3bd (diff) | |
| download | gitlab-ce-api-branch-status.tar.gz | |
API: Expose branch statusapi-branch-status
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index fdb19558c1c..d5dfb8d00be 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -141,8 +141,12 @@ module API options[:project].repository.commit(repo_branch.dereferenced_target) end + expose :merged do |repo_branch, options| + options[:project].repository.merged_to_root_ref?(repo_branch.name) + end + expose :protected do |repo_branch, options| - options[:project].protected_branch? repo_branch.name + options[:project].protected_branch?(repo_branch.name) end expose :developers_can_push do |repo_branch, options| |