summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-10 14:31:21 +0000
committerRémy Coutable <remy@rymai.me>2016-06-10 14:31:21 +0000
commit133d5c1c64b9d9265736a8b6277fcd73730c6612 (patch)
tree154c589a076088cb42588894154c1ad15c9b1c58 /lib
parent2ff359142a08af8656f5f6ed90a65e90ecec32f2 (diff)
parent9ba0f83d25a7ae8ad8a500f706af45de9fc469b6 (diff)
downloadgitlab-ce-133d5c1c64b9d9265736a8b6277fcd73730c6612.tar.gz
Merge branch 'rename-ci-commit-phase-4' into 'master'
Rename Commit to Pipeline in TriggerRequest Changes in TriggerRequest a `commit` to `pipeline`. See merge request !4505
Diffstat (limited to 'lib')
-rw-r--r--lib/ci/api/entities.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb
index b25e0e573a8..a902ced35d7 100644
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
@@ -56,7 +56,7 @@ module Ci
class TriggerRequest < Grape::Entity
expose :id, :variables
- expose :commit, using: Commit
+ expose :pipeline, using: Commit, as: :commit
end
end
end