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
ae352dec
Commit
ae352dec
authored
Sep 04, 2017
by
Sean McGivern
Committed by
Bryce Johnson
Sep 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix IssuesController redirects
parent
f8981fae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-2
ee/app/controllers/ee/projects/issues_controller.rb
ee/app/controllers/ee/projects/issues_controller.rb
+1
-2
No files found.
app/controllers/projects/issues_controller.rb
View file @
ae352dec
...
@@ -10,6 +10,7 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -10,6 +10,7 @@ class Projects::IssuesController < Projects::ApplicationController
before_action
:check_issues_available!
before_action
:check_issues_available!
before_action
:issue
,
except:
[
:index
,
:new
,
:create
,
:bulk_update
,
:export_csv
]
before_action
:issue
,
except:
[
:index
,
:new
,
:create
,
:bulk_update
,
:export_csv
]
before_action
:set_issues_index
,
only:
[
:index
]
# Allow write(create) issue
# Allow write(create) issue
before_action
:authorize_create_issue!
,
only:
[
:new
,
:create
]
before_action
:authorize_create_issue!
,
only:
[
:new
,
:create
]
...
@@ -25,8 +26,6 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -25,8 +26,6 @@ class Projects::IssuesController < Projects::ApplicationController
respond_to
:html
respond_to
:html
def
index
def
index
set_issues_index
if
params
[
:assignee_id
].
present?
if
params
[
:assignee_id
].
present?
assignee
=
User
.
find_by_id
(
params
[
:assignee_id
])
assignee
=
User
.
find_by_id
(
params
[
:assignee_id
])
@users
.
push
(
assignee
)
if
assignee
@users
.
push
(
assignee
)
if
assignee
...
...
ee/app/controllers/ee/projects/issues_controller.rb
View file @
ae352dec
...
@@ -6,12 +6,11 @@ module EE
...
@@ -6,12 +6,11 @@ module EE
prepended
do
prepended
do
before_action
:check_export_issues_available!
,
only:
[
:export_csv
]
before_action
:check_export_issues_available!
,
only:
[
:export_csv
]
before_action
:check_service_desk_available!
,
only:
[
:service_desk
]
before_action
:check_service_desk_available!
,
only:
[
:service_desk
]
before_action
:set_issues_index
,
only:
[
:index
,
:service_desk
]
skip_before_action
:issue
,
only:
[
:service_desk
]
skip_before_action
:issue
,
only:
[
:service_desk
]
end
end
def
service_desk
def
service_desk
set_issues_index
if
params
[
:assignee_id
].
present?
if
params
[
:assignee_id
].
present?
assignee
=
User
.
find_by_id
(
params
[
:assignee_id
])
assignee
=
User
.
find_by_id
(
params
[
:assignee_id
])
@users
.
push
(
assignee
)
if
assignee
@users
.
push
(
assignee
)
if
assignee
...
...
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