Commit ad18f91e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents 577fe180 0c26f871
...@@ -54,6 +54,11 @@ pre { ...@@ -54,6 +54,11 @@ pre {
text-shadow: none; text-shadow: none;
} }
.dropdown-menu-align-right {
left: auto;
right: 0px;
}
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus { .dropdown-menu > li > a:focus {
background: $bg_primary; background: $bg_primary;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- else - else
Newest Newest
%b.caret %b.caret
%ul.dropdown-menu %ul.dropdown-menu.dropdown-menu-align-right
%li %li
= link_to page_filter_path(sort: 'newest') do = link_to page_filter_path(sort: 'newest') do
= sort_title_recently_created = sort_title_recently_created
......
...@@ -109,6 +109,7 @@ Parameters: ...@@ -109,6 +109,7 @@ Parameters:
- `target_branch` (required) - The target branch - `target_branch` (required) - The target branch
- `assignee_id` (optional) - Assignee user ID - `assignee_id` (optional) - Assignee user ID
- `title` (required) - Title of MR - `title` (required) - Title of MR
- `description` (optional) - Description of MR
- `target_project_id` (optional) - The target project (numeric id) - `target_project_id` (optional) - The target project (numeric id)
```json ```json
...@@ -160,6 +161,7 @@ Parameters: ...@@ -160,6 +161,7 @@ Parameters:
- `target_branch` - The target branch - `target_branch` - The target branch
- `assignee_id` - Assignee user ID - `assignee_id` - Assignee user ID
- `title` - Title of MR - `title` - Title of MR
- `description` - Description of MR
- `state_event` - New state (close|reopen|merge) - `state_event` - New state (close|reopen|merge)
```json ```json
...@@ -169,6 +171,7 @@ Parameters: ...@@ -169,6 +171,7 @@ Parameters:
"source_branch": "test1", "source_branch": "test1",
"project_id": 3, "project_id": 3,
"title": "test1", "title": "test1",
"description": "description1",
"state": "opened", "state": "opened",
"upvotes": 0, "upvotes": 0,
"downvotes": 0, "downvotes": 0,
......
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