Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
This commit is contained in:
commit
ad18f91e9e
3 changed files with 9 additions and 1 deletions
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue