diff --git a/.gitignore b/.gitignore
index 2c6b65b7b7d..7a7b5c93936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,42 @@
-.bundle
-.rbx/
-db/*.sqlite3
-db/*.sqlite3-journal
-log/*.log*
-tmp/
-.sass-cache/
-coverage/*
-backups/*
+*.log
 *.swp
-public/uploads/
-.ruby-version
-.ruby-gemset
-.rvmrc
-.rbenv-version
+.DS_Store
+.bundle
+.chef
 .directory
-nohup.out
-Vagrantfile
+.envrc
+.gitlab_shell_secret
+.idea
+.rbenv-version
+.rbx/
+.ruby-gemset
+.ruby-version
+.rvmrc
+.sass-cache/
+.secret
 .vagrant
-config/gitlab.yml
+Vagrantfile
+backups/*
+config/aws.yml
 config/database.yml
+config/gitlab.yml
 config/initializers/omniauth.rb
 config/initializers/rack_attack.rb
 config/initializers/smtp_settings.rb
-config/unicorn.rb
 config/resque.yml
-config/aws.yml
+config/unicorn.rb
+coverage/*
+db/*.sqlite3
+db/*.sqlite3-journal
 db/data.yml
-.idea
-.DS_Store
-.chef
-vendor/bundle/*
-rails_best_practices_output.html
 doc/code/*
-.secret
-*.log
-public/uploads.*
-public/assets/
-.envrc
 dump.rdb
+log/*.log*
+nohup.out
+public/assets/
+public/uploads.*
+public/uploads/
+rails_best_practices_output.html
 tags
-.gitlab_shell_secret
+tmp/
+vendor/bundle/*