r888888888 18dd5acca7 Merge branch 'ruby-2.1' ...

Conflicts:
	app/assets/javascripts/comments.js
	app/helpers/delayed_jobs_helper.rb

2014-04-23 18:05:31 -07:00

..

deploy

revert deploy script changes

2014-03-17 13:22:00 -07:00

environments

fixes #2133

2014-04-16 17:43:34 -07:00

initializers

fixes #2133

2014-04-16 17:43:34 -07:00

locales

fixes #1041

2013-03-22 20:36:34 -04:00

unicorn

fixes #1513

2014-03-17 18:07:20 -07:00

application.rb

Merge branch 'ruby-2.1'

2014-04-23 18:05:31 -07:00

boot.rb

fixes #2133

2014-04-16 17:43:34 -07:00

danbooru_default_config.rb

new version

2014-04-23 14:20:49 -07:00

deploy.rb

fixes #2126

2014-04-11 16:43:37 +08:00

environment.rb

fixes #2133

2014-04-16 17:43:34 -07:00

monit.conf

add hourly check for upload queue issues, restore old note coloring

2013-03-12 15:49:58 -04:00

routes.rb

fixes #2133

2014-04-16 17:43:34 -07:00

schedule.rb

consolidate cronjobs

2013-04-04 18:15:13 -04:00

secrets.yml

fixes #2133

2014-04-16 17:43:34 -07:00

state_checker.rb

Kill trailing whitespace in ruby files

2013-03-19 23:10:10 +11:00