Commit 5b52d7b9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'add_complete_commit_message_to_api' of...

Merge branch 'add_complete_commit_message_to_api' of https://gitlab.com/christian.taedcke/gitlab-ce into christian.taedcke/gitlab-ce-add_complete_commit_message_to_api
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
parents 04d1128b e59674f9
...@@ -6,6 +6,7 @@ v 7.2.0 ...@@ -6,6 +6,7 @@ v 7.2.0
- Better labels: colors, ability to rename and remove - Better labels: colors, ability to rename and remove
- Improve the way merge request collects diffs - Improve the way merge request collects diffs
- Improve compare page for large diffs - Improve compare page for large diffs
- Expose the full commit message via API
v 7.1.0 v 7.1.0
- Remove observers - Remove observers
......
...@@ -21,7 +21,8 @@ Parameters: ...@@ -21,7 +21,8 @@ Parameters:
"title": "Replace sanitize with escape once", "title": "Replace sanitize with escape once",
"author_name": "Dmitriy Zaporozhets", "author_name": "Dmitriy Zaporozhets",
"author_email": "dzaporozhets@sphereconsultinginc.com", "author_email": "dzaporozhets@sphereconsultinginc.com",
"created_at": "2012-09-20T11:50:22+03:00" "created_at": "2012-09-20T11:50:22+03:00",
"message": "Replace sanitize with escape once"
}, },
{ {
"id": "6104942438c14ec7bd21c6cd5bd995272b3faff6", "id": "6104942438c14ec7bd21c6cd5bd995272b3faff6",
...@@ -29,7 +30,8 @@ Parameters: ...@@ -29,7 +30,8 @@ Parameters:
"title": "Sanitize for network graph", "title": "Sanitize for network graph",
"author_name": "randx", "author_name": "randx",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "dmitriy.zaporozhets@gmail.com",
"created_at": "2012-09-20T09:06:12+03:00" "created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph"
} }
] ]
``` ```
...@@ -55,6 +57,7 @@ Parameters: ...@@ -55,6 +57,7 @@ Parameters:
"author_name": "randx", "author_name": "randx",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "dmitriy.zaporozhets@gmail.com",
"created_at": "2012-09-20T09:06:12+03:00", "created_at": "2012-09-20T09:06:12+03:00",
"message": "Sanitize for network graph",
"committed_date": "2012-09-20T09:06:12+03:00", "committed_date": "2012-09-20T09:06:12+03:00",
"authored_date": "2012-09-20T09:06:12+03:00", "authored_date": "2012-09-20T09:06:12+03:00",
"parent_ids": [ "parent_ids": [
......
...@@ -102,6 +102,7 @@ module API ...@@ -102,6 +102,7 @@ module API
class RepoCommit < Grape::Entity class RepoCommit < Grape::Entity
expose :id, :short_id, :title, :author_name, :author_email, :created_at expose :id, :short_id, :title, :author_name, :author_email, :created_at
expose :safe_message, as: :message
end end
class RepoCommitDetail < RepoCommit class RepoCommitDetail < RepoCommit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment