Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-12-13 16:51:23 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-12-13 16:51:23 +0300
commit84290a452dcdd2271337e2301b846c9498b74c86 (patch)
tree0693203e332944e1fb847be5700e35eb22bf851d /lib
parent00970606d78486a8b6672659e9ea28521a102e44 (diff)
Make it possible to mix `Gitlab::Routing` in
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/status/core.rb2
-rw-r--r--lib/gitlab/routing.rb6
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/gitlab/ci/status/core.rb b/lib/gitlab/ci/status/core.rb
index 12c0ca1d6d5..46fef8262c1 100644
--- a/lib/gitlab/ci/status/core.rb
+++ b/lib/gitlab/ci/status/core.rb
@@ -4,7 +4,7 @@ module Gitlab
# Base abstract class fore core status
#
class Core
- include Gitlab::Routing.url_helpers
+ include Gitlab::Routing
include Gitlab::Allowable
attr_reader :subject, :user
diff --git a/lib/gitlab/routing.rb b/lib/gitlab/routing.rb
index 5132177de51..632e2d87500 100644
--- a/lib/gitlab/routing.rb
+++ b/lib/gitlab/routing.rb
@@ -1,5 +1,11 @@
module Gitlab
module Routing
+ extend ActiveSupport::Concern
+
+ included do
+ include Gitlab::Routing.url_helpers
+ end
+
# Returns the URL helpers Module.
#
# This method caches the output as Rails' "url_helpers" method creates an