Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-06 00:07:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-06 00:07:46 +0300
commit82cef8dd1f48ffbc7aaa1ff7374cdb859137e01e (patch)
tree0ebdac2f1880dd1dd3f73a956082759314e0994f /lib/api
parent2baa63e740214382387abe77eeea6c0b1759e621 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
-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 9faae460527..93982d7eefc 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -755,6 +755,7 @@ module API
end
expose :diff_head_sha, as: :sha
expose :merge_commit_sha
+ expose :squash_commit_sha
expose :discussion_locked
expose :should_remove_source_branch?, as: :should_remove_source_branch
expose :force_remove_source_branch?, as: :force_remove_source_branch