Commit 50b17253 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improve/admin' of dev.gitlabhq.com:gitlab/gitlabhq

parents 78698698 c2982c9a
......@@ -371,6 +371,7 @@ li.note {
font-size: 48px;
padding: 20px;
text-align: center;
font-weight: normal;
}
}
}
......
......@@ -25,17 +25,51 @@
= link_to 'New User', new_admin_user_path, class: "btn small"
.row
.span6
%h3 Latest projects
.span4
%h4 Latest projects
%hr
- @projects.each do |project|
%p
= link_to project.name_with_namespace, [:admin, project]
.span6
%h3 Latest users
%span.light.right
= time_ago_in_words project.created_at
ago
.span4
%h4 Latest users
%hr
- @users.each do |user|
%p
= link_to [:admin, user] do
= user.name
%small= user.email
%span.light.right
= time_ago_in_words user.created_at
ago
.span4
%h4 Stats
%hr
%p
Issues
%span.light.right
= Issue.count
%p
Merge Requests
%span.light.right
= MergeRequest.count
%p
Notes
%span.light.right
= Note.count
%p
Snippets
%span.light.right
= Snippet.count
%p
SSH Keys
%span.light.right
= Key.count
%p
Milestones
%span.light.right
= Milestone.count
......@@ -5,6 +5,8 @@
= link_to "application.log", "#application", 'data-toggle' => 'tab'
%li
= link_to "production.log", "#production", 'data-toggle' => 'tab'
%li
= link_to "sidekiq.log", "#sidekiq", 'data-toggle' => 'tab'
%p.light To prevent perfomance issues admin logs output the last 2000 lines
.tab-content
......@@ -50,3 +52,17 @@
- Gitlab::Logger.read_latest_for('production.log').each do |line|
%li
%p= line
.tab-pane#sidekiq
.file_holder#README
.file_title
%i.icon-file
sidekiq.log
.right
= link_to '#', class: 'log-bottom' do
%i.icon-arrow-down
Scroll down
.file_content.logs
%ol
- Gitlab::Logger.read_latest_for('sidekiq.log').each do |line|
%li
%p= line
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