diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-24 09:33:22 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-24 09:33:22 +0300 |
| commit | 55f83385023adf0fc70a54922209388a223dd05f (patch) | |
| tree | a2efdaae7fc06a8f093cdd314dac8f678f44a224 /Gemfile.lock | |
| parent | 1e1c5b7afe42d6d88997aaa4f4877c37965866a5 (diff) | |
| parent | 65989141dcc58eaa3cecfe98bc97a10075cf4f7e (diff) | |
| download | gitlab-ce-55f83385023adf0fc70a54922209388a223dd05f.tar.gz | |
Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7f252a66d12..c454a41ca0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -257,6 +257,9 @@ GEM resque_mailer (2.0.3) actionmailer (>= 3.0.0) resque (>= 1.2.3) + resque_spec (0.11.0) + resque (>= 1.19.0) + rspec (>= 2.5.0) rspec (2.10.0) rspec-core (~> 2.10.0) rspec-expectations (~> 2.10.0) @@ -385,6 +388,7 @@ DEPENDENCIES redcarpet (~> 2.1.1) resque (~> 1.20.0) resque_mailer + resque_spec rspec-rails sass-rails (= 3.2.5) seed-fu |