Commit f0a132ed authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'active-users-check' into 'master'

Active users check

For gitlab/gitlab-ee#248

See merge request !1673
parents c572bdb5 0d4328fd
...@@ -47,6 +47,7 @@ v 7.9.0 (unreleased) ...@@ -47,6 +47,7 @@ v 7.9.0 (unreleased)
- Fix highliht of selected lines in file - Fix highliht of selected lines in file
- Reject access to group/project avatar if the user doesn't have access. - Reject access to group/project avatar if the user doesn't have access.
- Add database migration to clean group duplicates with same path and name (Make sure you have a backup before update) - Add database migration to clean group duplicates with same path and name (Make sure you have a backup before update)
- Add GitLab active users count to rake gitlab:check
v 7.8.2 v 7.8.2
- Fix service migration issue when upgrading from versions prior to 7.3 - Fix service migration issue when upgrading from versions prior to 7.3
......
...@@ -29,6 +29,7 @@ namespace :gitlab do ...@@ -29,6 +29,7 @@ namespace :gitlab do
check_redis_version check_redis_version
check_ruby_version check_ruby_version
check_git_version check_git_version
check_active_users
finished_checking "GitLab" finished_checking "GitLab"
end end
...@@ -781,6 +782,10 @@ namespace :gitlab do ...@@ -781,6 +782,10 @@ namespace :gitlab do
end end
end end
def check_active_users
puts "Active users: #{User.active.count}"
end
def omnibus_gitlab? def omnibus_gitlab?
Dir.pwd == '/opt/gitlab/embedded/service/gitlab-rails' Dir.pwd == '/opt/gitlab/embedded/service/gitlab-rails'
end end
......
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