Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
5ef0b990d72a
Commit
9b6f1c59
authored
Jul 16, 2015
by
Marin Jankovski
Browse files
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
98661a359fa8
71e752c84885
Changes
2
Hide whitespace changes
Inline
Side-by-side
doc/api/merge_requests.md
View file @
5ef0b990
...
...
@@ -49,7 +49,8 @@ Parameters:
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"description"
:
"fixed login page css paddings"
"description"
:
"fixed login page css paddings"
,
"work_in_progress"
:
false
}
]
```
...
...
@@ -94,7 +95,8 @@ Parameters:
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"description"
:
"fixed login page css paddings"
"description"
:
"fixed login page css paddings"
,
"work_in_progress"
:
false
}
```
...
...
@@ -118,6 +120,7 @@ Parameters:
"project_id"
:
4
,
"title"
:
"Blanditiis beatae suscipit hic assumenda et molestias nisi asperiores repellat et."
,
"description"
:
"Qui voluptatibus placeat ipsa alias quasi. Deleniti rem ut sint. Optio velit qui distinctio."
,
"work_in_progress"
:
false
,
"state"
:
"reopened"
,
"created_at"
:
"2015-02-02T19:49:39.159Z"
,
"updated_at"
:
"2015-02-02T20:08:49.959Z"
,
...
...
lib/api/entities.rb
View file @
5ef0b990
...
...
@@ -171,6 +171,7 @@ class MergeRequest < ProjectEntity
expose
:source_project_id
,
:target_project_id
expose
:label_names
,
as: :labels
expose
:description
expose
:work_in_progress?
,
as: :work_in_progress
expose
:milestone
,
using:
Entities
::
Milestone
end
...
...
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