From b0ec61500e4de9dafd9dfb0177d92349c789de8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Sat, 17 Jan 2015 16:39:29 +0100
Subject: Fixes the sort dropdown goind outside of the screen

see gitlab-org/gitlab-ce#986
---
 app/assets/stylesheets/generic/common.scss | 5 +++++
 app/views/shared/_sort_dropdown.html.haml  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index cd6352db85f..1a7e96f1d0c 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -54,6 +54,11 @@ pre {
   text-shadow: none;
 }
 
+.dropdown-menu-align-right {
+  left: auto;
+  right: 0px;
+}
+
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
   background: $bg_primary;
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index 93ed9b67336..3e6a62380f3 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -6,7 +6,7 @@
     - else
       Newest
     %b.caret
-  %ul.dropdown-menu
+  %ul.dropdown-menu.dropdown-menu-align-right
     %li
       = link_to page_filter_path(sort: 'newest') do
         = sort_title_recently_created
-- 
cgit v1.2.1


From 5bd463c1d2a10be21344e80084072927e0f2081e Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Sun, 18 Jan 2015 13:42:20 +0100
Subject: Add description to merge request

The description can be provided when creating or updating a merge
request.

Signed-off-by: Loic Dachary <loic@dachary.org>
---
 doc/api/merge_requests.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 14884e53915..053fc9346be 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -109,6 +109,7 @@ Parameters:
 - `target_branch` (required)     - The target branch
 - `assignee_id` (optional)       - Assignee user ID
 - `title` (required)             - Title of MR
+- `description` (optional)       - Description of MR
 - `target_project_id` (optional) - The target project (numeric id)
 
 ```json
@@ -160,6 +161,7 @@ Parameters:
 - `target_branch`               - The target branch
 - `assignee_id`                 - Assignee user ID
 - `title`                       - Title of MR
+- `description`                 - Description of MR
 - `state_event`                 - New state (close|reopen|merge)
 
 ```json
@@ -169,6 +171,7 @@ Parameters:
   "source_branch": "test1",
   "project_id": 3,
   "title": "test1",
+  "description": "description1",
   "state": "opened",
   "upvotes": 0,
   "downvotes": 0,
-- 
cgit v1.2.1