kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge pull request #6788 from CingleVue/master 

Patched `MergeRequest` to return more data.
This commit is contained in:
Dmitriy Zaporozhets 2014-08-13 16:47:51 +03:00
parent 32de669159 d048a27771
commit 71f87ffb66
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/api/merge_requests.md
View File

@ -42,7 +42,8 @@ Parameters:
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
}
},
"description":"fixed login page css paddings"
}
]
```
@ -86,7 +87,8 @@ Parameters:
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
}
},
"description":"fixed login page css paddings"
}
```
@ -132,7 +134,8 @@ Parameters:
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
}
},
"description":"fixed login page css paddings"
}
```

2
lib/api/entities.rb
View File

@ -137,6 +137,8 @@ module API
expose :author, :assignee, using: Entities::UserBasic
expose :source_project_id, :target_project_id
expose :label_names, as: :labels
expose :description
expose :milestone, using: Entities::Milestone
end
class SSHKey < Grape::Entity