Skip to content

G
gitlab-ce
Commit 137a04b3 authored by Sean McGivern's avatar Sean McGivern
Browse files
Options

Resolve conflicts in Projects::IssuesController

parent 855d6c50
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/controllers/projects/issues_controller.rb
View file @ 137a04b3
...@@ -9,11 +9,8 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -9,11 +9,8 @@ class Projects::IssuesController < Projects::ApplicationController
include IssuesCalendar include IssuesCalendar
include SpammableActions include SpammableActions
<<<<<<< HEAD
prepend ::EE::Projects::IssuesController prepend ::EE::Projects::IssuesController
=======
>>>>>>> upstream/master
def self.authenticate_user_only_actions def self.authenticate_user_only_actions
%i[new] %i[new]
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7