diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 10:52:53 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 10:52:53 -0800 |
| commit | ad18f91e9e1a59333c79ea73419184a4198fabfd (patch) | |
| tree | f288880f33039554df329fe069115f42f254dabb | |
| parent | 577fe18073d45e62db5c6a0d308d9bfa81a3a26f (diff) | |
| parent | 0c26f871e30f84221c41fc034c412c68773bce15 (diff) | |
| download | gitlab-ce-ad18f91e9e1a59333c79ea73419184a4198fabfd.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | app/assets/stylesheets/generic/common.scss | 5 | ||||
| -rw-r--r-- | app/views/shared/_sort_dropdown.html.haml | 2 | ||||
| -rw-r--r-- | doc/api/merge_requests.md | 3 |
3 files changed, 9 insertions, 1 deletions
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 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, |