Merge branch 'master' of github.com:mperham/sidekiq

lib/sidekiq/cli.rb

@@ -346,7 +346,11 @@ module Sidekiq
         die 1
       end
       @parser.parse!(argv)
-      opts[:config_file] ||= 'config/sidekiq.yml' if File.exist?('config/sidekiq.yml')
+
+      %w[config/sidekiq.yml config/sidekiq.yml.erb].each do |filename|
+        opts[:config_file] ||= filename if File.exist?(filename)
+      end
+
       opts
     end
 

web/assets/stylesheets/application.css

@@ -181,6 +181,10 @@ form .btn {
   margin-right: 5px;
 }
 
+form .btn-group .btn {
+  margin-right: 1px;
+}
+
 td form {
   margin-bottom: 0;
 }

web/views/busy.erb

@@ -12,7 +12,6 @@
     </form>
   </div>
 </div>
-</div>
 
 <div class="table_container">
   <table class="processes table table-hover table-bordered table-striped table-white">