diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-12 22:02:13 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-12 22:02:13 +0400 |
| commit | 39504aa19be31fa5ef8ea03e9182e6016526b365 (patch) | |
| tree | f43e59d7b1f1c7321de83e8a94f26ffece26ba2d /Gemfile.lock | |
| parent | 0a3874f6a30d50da170d4cf43abc51a43b696d33 (diff) | |
| parent | 25b80767bd0b7f715d5e0d77644788e11c3d585c (diff) | |
Merge branch 'resquemailer' of https://github.com/oreofish/gitlabhq into oreofish-resquemailer
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6f87c3df114..8249f41bb61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -224,19 +224,10 @@ GEM redis-namespace (~> 1.0.2) sinatra (>= 0.9.2) vegas (~> 0.1.2) - rspec (2.10.0) - rspec-core (~> 2.10.0) - rspec-expectations (~> 2.10.0) - rspec-mocks (~> 2.10.0) - rspec-core (2.10.0) - rspec-expectations (2.10.0) - diff-lcs (~> 1.1.3) - rspec-mocks (2.10.1) + resque_mailer (2.0.3) + actionmailer (>= 3.0.0) + resque (>= 1.2.3) rspec-rails (2.10.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec (~> 2.10.0) rubyntlm (0.1.1) rubypython (0.5.3) blankslate (>= 2.1.2.3) @@ -350,6 +341,7 @@ DEPENDENCIES rake redcarpet (~> 2.1.1) resque (~> 1.20.0) + resque_mailer rspec-rails sass-rails (= 3.2.3) seed-fu |