diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-12-12 16:45:34 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-12-12 16:45:34 +0000 |
| commit | 8782fd848f5f9df699813bac777e2053d395137c (patch) | |
| tree | f56e4fb637c11adbd9292caf700586ade7b1c18d | |
| parent | 6bf8a2eb3894e5a4fe74baf6b16a41c9554a13d4 (diff) | |
| parent | 69cb869fcae6706fd4e4d8d889dea2ba1788ef80 (diff) | |
Merge remote-tracking branch 'henare_github/rspec' into develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 0 insertions, 3 deletions
@@ -28,8 +28,6 @@ gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails' gem 'rmagick', :require => 'RMagick' gem 'routing-filter', '~> 0.2.4' gem 'rake', '0.9.2.2' -gem 'rspec', '~> 1.3.2' -gem 'rspec-rails', '~> 1.3.4' gem 'ruby-msg', '~> 1.5.0' gem 'vpim' gem 'will_paginate', '~> 2.3.11' diff --git a/Gemfile.lock b/Gemfile.lock index 6e6f955a9..1a7c59518 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,7 +171,6 @@ DEPENDENCIES recaptcha (~> 0.3.1) rmagick routing-filter (~> 0.2.4) - rspec (~> 1.3.2) rspec-rails (~> 1.3.4) ruby-debug ruby-debug19 |