# This is a combination of 2 commits.

# The first commit's message is: Patched `MergeRequest` to return more data. Patched `MergeRequest` to return the `description` & `milestone` Conflicts: lib/api/entities.rb # This is the 2nd commit message: Update merge_requests.md Update documentation for merge request endpoint adding support for description.

# This is a combination of 2 commits.
4a36d669 · mabdullah-cinglevue · Mustafa · ec18f0ba · 4a36d669 · 4a36d669
Commit 4a36d669 authored Apr 16, 2014 by mabdullah-cinglevue Committed by Mustafa Aug 01, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

merge_requests.md doc/api/merge_requests.md +6 -3

entities.rb lib/api/entities.rb +1 -0

No files found.
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -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"
 }
 ```


--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -136,6 +136,7 @@ module API
      expose :author, :assignee, using: Entities::UserBasic
      expose :source_project_id, :target_project_id
      expose :label_names, as: :labels
+      expose :description, :milestone_id
    end

    class SSHKey < Grape::Entity