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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5f043540
Commit
5f043540
authored
May 25, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-25
parents
429848e9
6f4935bc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
lib/api/milestone_responses.rb
lib/api/milestone_responses.rb
+1
-1
spec/support/api/milestones_shared_examples.rb
spec/support/api/milestones_shared_examples.rb
+6
-0
No files found.
lib/api/milestone_responses.rb
View file @
5f043540
...
...
@@ -24,7 +24,7 @@ module API
optional
:state_event
,
type:
String
,
values:
%w[close activate]
,
desc:
'The state event of the milestone '
use
:optional_params
at_least_one_of
:title
,
:description
,
:due_date
,
:state_event
at_least_one_of
:title
,
:description
,
:
start_date
,
:
due_date
,
:state_event
end
def
list_milestones_for
(
parent
)
...
...
spec/support/api/milestones_shared_examples.rb
View file @
5f043540
...
...
@@ -196,6 +196,12 @@ shared_examples_for 'group and project milestones' do |route_definition|
expect
(
json_response
[
'state'
]).
to
eq
(
'closed'
)
end
it
'updates milestone with only start date'
do
put
api
(
resource_route
,
user
),
start_date:
Date
.
tomorrow
expect
(
response
).
to
have_gitlab_http_status
(
200
)
end
end
describe
"GET
#{
route_definition
}
/:milestone_id/issues"
do
...
...
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