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
4e2de04a
Commit
4e2de04a
authored
Jul 03, 2019
by
egrieff
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove support for merge request bulk update
parent
49e00774
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
33 deletions
+0
-33
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+0
-5
ee/app/controllers/groups/merge_requests_controller.rb
ee/app/controllers/groups/merge_requests_controller.rb
+0
-14
ee/config/routes/group.rb
ee/config/routes/group.rb
+0
-6
ee/spec/routing/group_routing_spec.rb
ee/spec/routing/group_routing_spec.rb
+0
-8
No files found.
app/views/groups/merge_requests.html.haml
View file @
4e2de04a
...
...
@@ -9,13 +9,8 @@
=
render
'shared/issuable/nav'
,
type: :merge_requests
-
if
current_user
.nav-controls
-
if
@can_bulk_update
=
button_tag
_
(
'Edit merge requests'
),
class:
'btn btn-default append-right-10 js-bulk-update-toggle'
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
type: :merge_requests
,
with_feature_enabled:
'merge_requests'
,
with_shared:
false
,
include_projects_in_subgroups:
true
=
render
'shared/issuable/search_bar'
,
type: :merge_requests
-
if
@can_bulk_update
=
render
'shared/issuable/group_bulk_update_sidebar'
,
type: :merge_requests
=
render
'shared/merge_requests'
ee/app/controllers/groups/merge_requests_controller.rb
deleted
100644 → 0
View file @
49e00774
# frozen_string_literal: true
class
Groups::MergeRequestsController
<
Groups
::
ApplicationController
include
IssuableActions
before_action
:authorize_admin_group!
before_action
:verify_group_bulk_edit_enabled!
,
only:
[
:bulk_update
]
private
def
verify_group_bulk_edit_enabled!
render_404
unless
@group
.
feature_available?
(
:group_bulk_edit
)
end
end
ee/config/routes/group.rb
View file @
4e2de04a
...
...
@@ -78,12 +78,6 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
end
end
resources
:merge_requests
,
only:
[]
do
collection
do
post
:bulk_update
end
end
resources
:todos
,
only:
[
:create
]
resources
:boards
,
only:
[
:create
,
:update
,
:destroy
]
do
collection
do
...
...
ee/spec/routing/group_routing_spec.rb
View file @
4e2de04a
...
...
@@ -88,12 +88,4 @@ describe 'Group routing', "routing" do
expect
(
post
(
'/groups/gitlabhq/-/issues/bulk_update'
)).
to
route_to
(
'groups/issues#bulk_update'
,
group_id:
'gitlabhq'
)
end
end
describe
'merge_requests'
do
it
'routes post to #bulk_update'
do
allow
(
Group
).
to
receive
(
:find_by_full_path
).
with
(
'gitlabhq'
,
any_args
).
and_return
(
true
)
expect
(
post
(
'/groups/gitlabhq/-/merge_requests/bulk_update'
)).
to
route_to
(
'groups/merge_requests#bulk_update'
,
group_id:
'gitlabhq'
)
end
end
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