diff options
| author | Eirik Lygre <eirik.lygre@gmail.com> | 2015-12-09 15:07:10 +0100 |
|---|---|---|
| committer | Eirik Lygre <eirik.lygre@gmail.com> | 2015-12-09 15:07:10 +0100 |
| commit | bb79573c01ad77d6b52245d3af262bc56f79693f (patch) | |
| tree | 1bd51c1c8adc50462f22591d6ab5af8315cf9eb6 /lib/api/entities.rb | |
| parent | 94dc9ef9e1a85b8a4506358479a549dc3a1306b6 (diff) | |
| parent | 9bfd6c44e23754b6f699586f6a0cec2879e107e0 (diff) | |
| download | gitlab-ce-bb79573c01ad77d6b52245d3af262bc56f79693f.tar.gz | |
Merge branch 'master' into default_clone_protocol_based_on_user_keys
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 96b73df6af9..81bf7a8222b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -171,6 +171,7 @@ module API expose :description expose :work_in_progress?, as: :work_in_progress expose :milestone, using: Entities::Milestone + expose :merge_when_build_succeeds end class MergeRequestChanges < MergeRequest |