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
1591b7c0
Commit
1591b7c0
authored
Jun 07, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix EE Cop/RedirectWithStatus failures introduced by merge
parent
29a3ac19
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
5 deletions
+8
-5
app/controllers/admin/geo_nodes_controller.rb
app/controllers/admin/geo_nodes_controller.rb
+1
-1
app/controllers/admin/licenses_controller.rb
app/controllers/admin/licenses_controller.rb
+1
-1
app/controllers/groups/hooks_controller.rb
app/controllers/groups/hooks_controller.rb
+1
-1
app/controllers/projects/boards_controller.rb
app/controllers/projects/boards_controller.rb
+1
-1
app/controllers/projects/path_locks_controller.rb
app/controllers/projects/path_locks_controller.rb
+1
-1
app/controllers/projects/protected_branches/merge_access_levels_controller.rb
...ects/protected_branches/merge_access_levels_controller.rb
+1
-0
app/controllers/projects/protected_branches/push_access_levels_controller.rb
...jects/protected_branches/push_access_levels_controller.rb
+1
-0
app/controllers/projects/protected_tags/create_access_levels_controller.rb
...rojects/protected_tags/create_access_levels_controller.rb
+1
-0
No files found.
app/controllers/admin/geo_nodes_controller.rb
View file @
1591b7c0
...
...
@@ -25,7 +25,7 @@ class Admin::GeoNodesController < Admin::ApplicationController
def
destroy
@node
.
destroy
redirect_to
admin_geo_nodes_path
,
notice:
'Node was successfully removed.'
redirect_to
admin_geo_nodes_path
,
status:
302
,
notice:
'Node was successfully removed.'
end
def
repair
...
...
app/controllers/admin/licenses_controller.rb
View file @
1591b7c0
...
...
@@ -43,7 +43,7 @@ class Admin::LicensesController < Admin::ApplicationController
flash
[
:alert
]
=
"The license was removed. GitLab now no longer has a valid license."
end
redirect_to
admin_license_path
redirect_to
admin_license_path
,
status:
302
end
private
...
...
app/controllers/groups/hooks_controller.rb
View file @
1591b7c0
...
...
@@ -43,7 +43,7 @@ class Groups::HooksController < Groups::ApplicationController
def
destroy
hook
.
destroy
redirect_to
group_hooks_path
(
@group
)
redirect_to
group_hooks_path
(
@group
)
,
status:
302
end
private
...
...
app/controllers/projects/boards_controller.rb
View file @
1591b7c0
...
...
@@ -60,7 +60,7 @@ class Projects::BoardsController < Projects::ApplicationController
service
.
execute
(
@board
)
respond_to
do
|
format
|
format
.
html
{
redirect_to
namespace_project_boards_path
(
@project
.
namespace
,
@project
)
}
format
.
html
{
redirect_to
namespace_project_boards_path
(
@project
.
namespace
,
@project
)
,
status:
302
}
end
end
...
...
app/controllers/projects/path_locks_controller.rb
View file @
1591b7c0
...
...
@@ -36,7 +36,7 @@ class Projects::PathLocksController < Projects::ApplicationController
respond_to
do
|
format
|
format
.
html
do
redirect_to
namespace_project_locks_path
(
@project
.
namespace
,
@project
)
redirect_to
namespace_project_locks_path
(
@project
.
namespace
,
@project
)
,
status:
302
end
format
.
js
end
...
...
app/controllers/projects/protected_branches/merge_access_levels_controller.rb
View file @
1591b7c0
...
...
@@ -8,6 +8,7 @@ module Projects
@merge_access_level
.
destroy
redirect_to
namespace_project_protected_branch_path
(
@project
.
namespace
,
@project
,
@protected_branch
),
status:
302
,
notice:
"Successfully deleted.
#{
@merge_access_level
.
humanize
}
will not be able to merge into this protected branch."
end
end
...
...
app/controllers/projects/protected_branches/push_access_levels_controller.rb
View file @
1591b7c0
...
...
@@ -8,6 +8,7 @@ module Projects
@push_access_level
.
destroy
redirect_to
namespace_project_protected_branch_path
(
@project
.
namespace
,
@project
,
@protected_branch
),
status:
302
,
notice:
"Successfully deleted.
#{
@push_access_level
.
humanize
}
will not be able to push to this protected branch."
end
end
...
...
app/controllers/projects/protected_tags/create_access_levels_controller.rb
View file @
1591b7c0
...
...
@@ -8,6 +8,7 @@ module Projects
@create_access_level
.
destroy
redirect_to
namespace_project_protected_tag_path
(
@project
.
namespace
,
@project
,
@protected_tag
),
status:
302
,
notice:
"Successfully deleted.
#{
@create_access_level
.
humanize
}
will not be able to create this protected tag."
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