BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
8a2aab44
Commit
8a2aab44
authored
Sep 06, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tc-test-admin-log-links' into 'master'
Put Admin loggers in before_action for easier overriding in EE See merge request !14081
parents
ba39b26c
ddf892b9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
logs_controller.rb
app/controllers/admin/logs_controller.rb
+8
-1
admin_browses_logs_spec.rb
spec/features/admin/admin_browses_logs_spec.rb
+5
-3
No files found.
app/controllers/admin/logs_controller.rb
View file @
8a2aab44
class
Admin
::
LogsController
<
Admin
::
ApplicationController
before_action
:loggers
def
show
@loggers
=
[
end
private
def
loggers
@loggers
||=
[
Gitlab
::
AppLogger
,
Gitlab
::
GitLogger
,
Gitlab
::
EnvironmentLogger
,
...
...
spec/features/admin/admin_browses_logs_spec.rb
View file @
8a2aab44
...
...
@@ -8,8 +8,10 @@ describe 'Admin browses logs' do
it
'shows available log files'
do
visit
admin_logs_path
expect
(
page
).
to
have_content
'test.log'
expect
(
page
).
to
have_content
'githost.log'
expect
(
page
).
to
have_content
'application.log'
expect
(
page
).
to
have_link
'application.log'
expect
(
page
).
to
have_link
'githost.log'
expect
(
page
).
to
have_link
'test.log'
expect
(
page
).
to
have_link
'sidekiq.log'
expect
(
page
).
to
have_link
'repocheck.log'
end
end
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