diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:38:22 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:38:22 -0300 |
| commit | c78da4d5c472f7254ed609ef753d7b1719732802 (patch) | |
| tree | f04630ac62d08a49744b90bdf20bf75dcb883838 /Gemfile | |
| parent | 4e4913462104df89f1bee08faeb4ba5aab8c9228 (diff) | |
| parent | 7ee055076ec2c5b2e9c110f821c10fe06bf38a1c (diff) | |
| download | rails-c78da4d5c472f7254ed609ef753d7b1719732802.tar.gz rails-c78da4d5c472f7254ed609ef753d7b1719732802.tar.bz2 rails-c78da4d5c472f7254ed609ef753d7b1719732802.zip | |
Merge branch 'master' into loofah
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -7,7 +7,7 @@ gemspec # ensure correct loading order gem 'mocha', '~> 0.14', require: false -gem 'rack', github: 'rack/rack' +gem 'rack', github: 'rack/rack', branch: 'master' gem 'rack-cache', '~> 1.2' gem 'jquery-rails', '~> 3.1.0' gem 'turbolinks', github: 'rails/turbolinks', branch: 'master' @@ -38,6 +38,20 @@ end # AS gem 'dalli', '>= 2.2.1' +# ActiveJob +gem 'globalid', github: 'rails/globalid' +gem 'resque', require: false +gem 'resque-scheduler', require: false +gem 'sidekiq', require: false +gem 'sucker_punch', require: false +gem 'delayed_job', require: false +gem 'queue_classic', require: false +gem 'sneakers', '0.1.1.pre', require: false +gem 'que', require: false +gem 'backburner', require: false +gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false +gem 'qu-redis', require: false + # Add your own local bundler stuff local_gemfile = File.dirname(__FILE__) + "/.Gemfile" instance_eval File.read local_gemfile if File.exist? local_gemfile |