diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-21 01:12:36 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-21 01:12:36 -0400 |
commit | ab3eaa120d11f04721fbe7d670e024358d3c46b0 (patch) | |
tree | 55042be19773106f9b62a5181c621bbfca695565 | |
parent | 5d9cb2ec8a1edcdea4a1fa91c688ede16ed03845 (diff) | |
parent | 1fcac4a83e838ef5b94ffb899ea6b4c5fd1984de (diff) |
Merge branch 'clean2'
Conflicts:
Gemfile
-rw-r--r-- | Gemfile | 6 | ||||
-rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -12,9 +12,6 @@ gem 'httparty' gem 'simple_captcha2', require: 'simple_captcha' -#gem 'rmagick' -#gem 'byebug' - group :development, :test do # Use sqlite3 as the database for Active Record gem 'sqlite3' @@ -49,6 +46,7 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' # Asynchronously handle longer or delayed tasks +gem 'daemons' gem 'delayed_job_active_record' group :doc do @@ -68,4 +66,4 @@ end # Use debugger # gem 'debugger', group: [:development, :test] -#gem 'byebug' +# gem 'byebug', group: [:development, :test] diff --git a/Gemfile.lock b/Gemfile.lock index fd03576..e0d013b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,7 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + daemons (1.1.9) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) delayed_job_active_record (4.0.0) @@ -131,6 +132,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) + daemons delayed_job_active_record httparty jbuilder (~> 1.2) |