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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
a3d8be09
Commit
a3d8be09
authored
Apr 18, 2014
by
sue445
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix can not automerge if description is too long
parent
4ba5acd2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
config/routes.rb
config/routes.rb
+1
-1
spec/routing/project_routing_spec.rb
spec/routing/project_routing_spec.rb
+5
-2
No files found.
CHANGELOG
View file @
a3d8be09
...
@@ -11,6 +11,7 @@ v 6.9.0
...
@@ -11,6 +11,7 @@ v 6.9.0
- Improve issue and merge request mobile UI (Drew Blessing)
- Improve issue and merge request mobile UI (Drew Blessing)
- Document how to convert a backup to PostgreSQL
- Document how to convert a backup to PostgreSQL
- Fix locale bug in backup manager
- Fix locale bug in backup manager
- Fix can not automerge when MR description is too long
- Fix wiki backup skip bug
- Fix wiki backup skip bug
v 6.8.0
v 6.8.0
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
a3d8be09
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
-
if
@show_merge_controls
-
if
@show_merge_controls
.automerge_widget.can_be_merged.hide
.automerge_widget.can_be_merged.hide
.clearfix
.clearfix
=
form_for
[
:automerge
,
@project
,
@merge_request
],
remote:
true
,
method: :
ge
t
do
|
f
|
=
form_for
[
:automerge
,
@project
,
@merge_request
],
remote:
true
,
method: :
pos
t
do
|
f
|
%h4
%h4
You can accept this request automatically.
You can accept this request automatically.
%div
%div
...
...
config/routes.rb
View file @
a3d8be09
...
@@ -273,7 +273,7 @@ Gitlab::Application.routes.draw do
...
@@ -273,7 +273,7 @@ Gitlab::Application.routes.draw do
resources
:merge_requests
,
constraints:
{
id:
/\d+/
},
except:
[
:destroy
]
do
resources
:merge_requests
,
constraints:
{
id:
/\d+/
},
except:
[
:destroy
]
do
member
do
member
do
get
:diffs
get
:diffs
ge
t
:automerge
pos
t
:automerge
get
:automerge_check
get
:automerge_check
get
:ci_status
get
:ci_status
end
end
...
...
spec/routing/project_routing_spec.rb
View file @
a3d8be09
...
@@ -213,7 +213,7 @@ describe Projects::RefsController, "routing" do
...
@@ -213,7 +213,7 @@ describe Projects::RefsController, "routing" do
end
end
# diffs_project_merge_request GET /:project_id/merge_requests/:id/diffs(.:format) projects/merge_requests#diffs
# diffs_project_merge_request GET /:project_id/merge_requests/:id/diffs(.:format) projects/merge_requests#diffs
# automerge_project_merge_request
GET
/:project_id/merge_requests/:id/automerge(.:format) projects/merge_requests#automerge
# automerge_project_merge_request
POST
/:project_id/merge_requests/:id/automerge(.:format) projects/merge_requests#automerge
# automerge_check_project_merge_request GET /:project_id/merge_requests/:id/automerge_check(.:format) projects/merge_requests#automerge_check
# automerge_check_project_merge_request GET /:project_id/merge_requests/:id/automerge_check(.:format) projects/merge_requests#automerge_check
# branch_from_project_merge_requests GET /:project_id/merge_requests/branch_from(.:format) projects/merge_requests#branch_from
# branch_from_project_merge_requests GET /:project_id/merge_requests/branch_from(.:format) projects/merge_requests#branch_from
# branch_to_project_merge_requests GET /:project_id/merge_requests/branch_to(.:format) projects/merge_requests#branch_to
# branch_to_project_merge_requests GET /:project_id/merge_requests/branch_to(.:format) projects/merge_requests#branch_to
...
@@ -230,7 +230,10 @@ describe Projects::MergeRequestsController, "routing" do
...
@@ -230,7 +230,10 @@ describe Projects::MergeRequestsController, "routing" do
end
end
it
"to #automerge"
do
it
"to #automerge"
do
get
(
"/gitlab/gitlabhq/merge_requests/1/automerge"
).
should
route_to
(
'projects/merge_requests#automerge'
,
project_id:
'gitlab/gitlabhq'
,
id:
'1'
)
post
(
'/gitlab/gitlabhq/merge_requests/1/automerge'
).
should
route_to
(
'projects/merge_requests#automerge'
,
project_id:
'gitlab/gitlabhq'
,
id:
'1'
)
end
end
it
"to #automerge_check"
do
it
"to #automerge_check"
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