summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-03-10 13:51:50 +0100
committerBob Van Landuyt <bob@gitlab.com>2017-03-13 08:27:52 +0100
commit0c6e685f8c6320312ed2272abc59be926e006d7c (patch)
tree448fe6ccf751d65393af49003247dba6c89efe51
parent9541bad2647360c35916b6a402122501b5374c29 (diff)
downloadgitlab-ce-0c6e685f8c6320312ed2272abc59be926e006d7c.tar.gz
Move `ResolveDiscussions` into `concerns/issues` folder
-rw-r--r--app/services/concerns/issues/resolve_discussions.rb (renamed from app/services/issues/resolve_discussions.rb)0
-rw-r--r--config/application.rb3
2 files changed, 2 insertions, 1 deletions
diff --git a/app/services/issues/resolve_discussions.rb b/app/services/concerns/issues/resolve_discussions.rb
index 297c7d696c3..297c7d696c3 100644
--- a/app/services/issues/resolve_discussions.rb
+++ b/app/services/concerns/issues/resolve_discussions.rb
diff --git a/config/application.rb b/config/application.rb
index 1cc092c4da1..98b2759a8a7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,7 +26,8 @@ module Gitlab
#{config.root}/app/models/hooks
#{config.root}/app/models/members
#{config.root}/app/models/project_services
- #{config.root}/app/workers/concerns))
+ #{config.root}/app/workers/concerns
+ #{config.root}/app/services/concerns))
config.generators.templates.push("#{config.root}/generator_templates")