diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-11-10 14:50:26 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-11-10 14:50:26 +0000 |
| commit | ce28b7b52bb931f94a977a55c0fd184dc220e1f5 (patch) | |
| tree | cb001c07f9f18c18e783feae3c69ff18cca85017 | |
| parent | e35662cd62c781b144d4154568ac7fa0b4c45d36 (diff) | |
| parent | 2d88541e90b6a85d844206abfd94d5762e951520 (diff) | |
Merge branch 'update-compass-rails-conservatively' into rails-3-develop
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 23 |
2 files changed, 16 insertions, 11 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' @@ -48,7 +48,7 @@ gem 'unidecoder' group :assets do gem 'bootstrap-sass' gem 'sass-rails', '~> 3.2.3' - gem 'compass-rails' + gem 'compass-rails', '2.0.0' gem 'coffee-rails', "~> 3.2.1" gem 'uglifier', '>= 1.0.3' gem 'therubyracer' diff --git a/Gemfile.lock b/Gemfile.lock index 76be7c352..51f736b50 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: @@ -58,7 +66,7 @@ GEM net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) charlock_holmes (0.6.9.4) - chunky_png (1.2.8) + chunky_png (1.3.3) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -72,8 +80,8 @@ GEM chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + compass-rails (2.0.0) + compass (>= 0.12.2) coveralls (0.6.7) colorize multi_json (~> 1.3) @@ -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) @@ -287,7 +292,7 @@ DEPENDENCIES capistrano charlock_holmes coffee-rails (~> 3.2.1) - compass-rails + compass-rails (= 2.0.0) coveralls debugger dynamic_form @@ -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) |