summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorToon Claes <toon@iotcl.com>2017-09-06 15:05:35 +0200
committerToon Claes <toon@iotcl.com>2017-09-06 15:25:51 +0200
commitddf892b9f26138c0fd43bbfa3b5d602ed954f59b (patch)
tree43191f15a4225104b65b68a8535852dcfbb789a4 /app
parent24244d03b55bc7732b3362bab1e1cc7e04c2dabf (diff)
downloadgitlab-ce-ddf892b9f26138c0fd43bbfa3b5d602ed954f59b.tar.gz
Put loggers in before_action for easier overriding in EEtc-test-admin-log-links
Make it easier to override the set of loggers, by putting them in a separate method. Also modify spec so it tests for links, instead of checking for regular text.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/logs_controller.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/admin/logs_controller.rb b/app/controllers/admin/logs_controller.rb
index bdc4332ae69..12a27cede75 100644
--- a/app/controllers/admin/logs_controller.rb
+++ b/app/controllers/admin/logs_controller.rb
@@ -1,6 +1,13 @@
class Admin::LogsController < Admin::ApplicationController
+ before_action :loggers
+
def show
- @loggers = [
+ end
+
+ private
+
+ def loggers
+ @loggers ||= [
Gitlab::AppLogger,
Gitlab::GitLogger,
Gitlab::EnvironmentLogger,