Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
ad18f91e
Commit
ad18f91e
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
577fe180
0c26f871
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+5
-0
app/views/shared/_sort_dropdown.html.haml
app/views/shared/_sort_dropdown.html.haml
+1
-1
doc/api/merge_requests.md
doc/api/merge_requests.md
+3
-0
No files found.
app/assets/stylesheets/generic/common.scss
View file @
ad18f91e
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/_sort_dropdown.html.haml
View file @
ad18f91e
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
doc/api/merge_requests.md
View file @
ad18f91e
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment