diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-11-06 11:55:02 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-11-06 11:55:02 +0000 |
| commit | 01f75c4256d2442852c8c74eb018c757fe2242ff (patch) | |
| tree | bc24e2034781897161b0cf14e4f8e6c0e81cbe98 | |
| parent | e35662cd62c781b144d4154568ac7fa0b4c45d36 (diff) | |
Use mysociety's version of ruby-msg.
A temporary measure until https://github.com/aquasync/ruby-msg/pull/10
can be merged. ruby-msg and sass (>=3.3) both define their own versions
of OrderedHash (sass only uses its version under Ruby 1.8.7) and they
conflict.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 15 |
2 files changed, 11 insertions, 6 deletions
@@ -24,7 +24,7 @@ gem 'rails-i18n' gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails' # :require avoids "already initialized constant" warnings gem 'rmagick', :require => 'RMagick' -gem 'ruby-msg', '~> 1.5.0' +gem 'ruby-msg', '~> 1.5.0', :git => 'git://github.com/mysociety/ruby-msg.git' gem "statistics2", "~> 0.54" gem 'syslog_protocol' gem 'thin' diff --git a/Gemfile.lock b/Gemfile.lock index 76be7c352..c6f9c96ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,6 +9,14 @@ GIT paper_trail (~> 2) GIT + remote: git://github.com/mysociety/ruby-msg.git + revision: ee0086add16c755d2eaf8dbcb90ba65809061cef + specs: + ruby-msg (1.5.2) + ruby-ole (>= 1.2.8) + vpim (>= 0.360) + +GIT remote: git://github.com/technoweenie/acts_as_versioned.git revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b specs: @@ -216,10 +224,7 @@ GEM ruby-debug-base (~> 0.10.4.0) ruby-debug-base (0.10.4) linecache (>= 0.3) - ruby-msg (1.5.1) - ruby-ole (>= 1.2.8) - vpim (>= 0.360) - ruby-ole (1.2.11.6) + ruby-ole (1.2.11.7) sass (3.2.10) sass-rails (3.2.6) railties (~> 3.2.0) @@ -323,7 +328,7 @@ DEPENDENCIES routing-filter rspec-rails ruby-debug - ruby-msg (~> 1.5.0) + ruby-msg (~> 1.5.0)! sass-rails (~> 3.2.3) spork-rails statistics2 (~> 0.54) |