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
Kazuhiko Shiozaki
gitlab-ce
Commits
1a57fbc4
Commit
1a57fbc4
authored
Oct 13, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
parents
989928ec
ea2008df
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
5 deletions
+22
-5
CHANGELOG
CHANGELOG
+1
-0
app/models/merge_request.rb
app/models/merge_request.rb
+3
-2
doc/api/merge_requests.md
doc/api/merge_requests.md
+2
-0
doc/web_hooks/web_hooks.md
doc/web_hooks/web_hooks.md
+4
-2
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+1
-1
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+11
-0
No files found.
CHANGELOG
View file @
1a57fbc4
...
...
@@ -64,6 +64,7 @@ v 8.0.3
- Fix URL shown in Slack notifications
- Fix bug where projects would appear to be stuck in the forked import state (Stan Hu)
- Fix Error 500 in creating merge requests with > 1000 diffs (Stan Hu)
- Add work_in_progress key to MR web hooks (Ben Boeckel)
v 8.0.2
- Fix default avatar not rendering in network graph (Stan Hu)
...
...
app/models/merge_request.rb
View file @
1a57fbc4
...
...
@@ -227,7 +227,7 @@ class MergeRequest < ActiveRecord::Base
end
def
work_in_progress?
title
=~
/\A\[?WIP\]?:? /i
!!
(
title
=~
/\A\[?WIP\]?:? /i
)
end
def
mergeable?
...
...
@@ -275,7 +275,8 @@ class MergeRequest < ActiveRecord::Base
attrs
=
{
source:
source_project
.
hook_attrs
,
target:
target_project
.
hook_attrs
,
last_commit:
nil
last_commit:
nil
,
work_in_progress:
work_in_progress?
}
unless
last_commit
.
nil?
...
...
doc/api/merge_requests.md
View file @
1a57fbc4
...
...
@@ -188,6 +188,7 @@ Parameters:
-
`title`
(required) - Title of MR
-
`description`
(optional) - Description of MR
-
`target_project_id`
(optional) - The target project (numeric id)
-
`labels`
(optional) - Labels for MR as a comma-separated list
```
json
{
...
...
@@ -239,6 +240,7 @@ Parameters:
-
`title`
- Title of MR
-
`description`
- Description of MR
-
`state_event`
- New state (close|reopen|merge)
-
`labels`
(optional) - Labels for MR as a comma-separated list
```
json
{
...
...
doc/web_hooks/web_hooks.md
View file @
1a57fbc4
...
...
@@ -314,7 +314,8 @@ X-Gitlab-Event: Note Hook
"name"
:
"John Smith"
,
"email"
:
"john@example.com"
}
}
},
"work_in_progress"
:
false
}
}
```
...
...
@@ -500,6 +501,7 @@ X-Gitlab-Event: Merge Request Hook
"email"
:
"gitlabdev@dv6700.(none)"
}
},
"work_in_progress"
:
false
,
"url"
:
"http://example.com/diaspora/merge_requests/1"
,
"action"
:
"open"
}
...
...
@@ -537,4 +539,4 @@ When you press 'Test Hook' in GitLab, you should see something like this in the
{"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
example.com - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
- -> /
```
\ No newline at end of file
```
lib/api/merge_requests.rb
View file @
1a57fbc4
...
...
@@ -99,7 +99,7 @@ module API
# id (required) - The ID of a project - this will be the source of the merge request
# source_branch (required) - The source branch
# target_branch (required) - The target branch
# target_project
- The target project of the merge request defaults to the :id of the project
# target_project
_id
- The target project of the merge request defaults to the :id of the project
# assignee_id - Assignee user ID
# title (required) - Title of MR
# description - Description of MR
...
...
spec/models/merge_request_spec.rb
View file @
1a57fbc4
...
...
@@ -165,6 +165,17 @@ describe MergeRequest do
end
end
describe
"#hook_attrs"
do
it
"has all the required keys"
do
attrs
=
subject
.
hook_attrs
attrs
=
attrs
.
to_h
expect
(
attrs
).
to
include
(
:source
)
expect
(
attrs
).
to
include
(
:target
)
expect
(
attrs
).
to
include
(
:last_commit
)
expect
(
attrs
).
to
include
(
:work_in_progress
)
end
end
it_behaves_like
'an editable mentionable'
do
subject
{
create
(
:merge_request
)
}
...
...
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