merge has removed Gemfile.lock

This commit is contained in:
Vladimir Krylov 2015-11-18 10:30:55 +02:00
parent e40ddbb134
commit 9eb4be7d18

View file

@ -24,6 +24,18 @@ GIT
hpricot hpricot
libxml-ruby libxml-ruby
GIT
remote: https://github.com/prehnRA/que-mailer.git
revision: 32156f258993348b50a7db2a41eed1bdb0bf4fab
branch: master
specs:
que_mailer (0.0.2)
actionmailer (>= 4.0)
activesupport (>= 4.0)
pg (~> 0)
que (~> 0.6)
rails (>= 4.0)
GIT GIT
remote: https://github.com/rubysec/bundler-audit.git remote: https://github.com/rubysec/bundler-audit.git
revision: f89ef7fae1090bbad825ea76812d56d72b417055 revision: f89ef7fae1090bbad825ea76812d56d72b417055
@ -599,6 +611,7 @@ DEPENDENCIES
pry (= 0.10.1) pry (= 0.10.1)
que (= 0.10.0) que (= 0.10.0)
que-web (= 0.4.0) que-web (= 0.4.0)
que_mailer!
railroady (= 1.3.0) railroady (= 1.3.0)
rails (= 4.2.4) rails (= 4.2.4)
rails-settings-cached (= 0.4.1) rails-settings-cached (= 0.4.1)