diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 16 |
2 files changed, 10 insertions, 8 deletions
@@ -53,7 +53,7 @@ gem 'unicode' gem 'unidecoder' group :assets do - gem 'sass-rails', "~> 3.1" + gem 'sass-rails', "= 3.1.4" gem 'uglifier' gem 'therubyracer' end diff --git a/Gemfile.lock b/Gemfile.lock index 5b0bcc9ed..7f488f1cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,8 +103,8 @@ GEM haml (4.0.3) tilt highline (1.6.19) - hike (1.2.2) - i18n (0.6.4) + hike (1.2.3) + i18n (0.6.5) jquery-rails (2.3.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -128,7 +128,7 @@ GEM sqlite3 (~> 1.3) thin (~> 1.5.0) mime-types (1.23) - multi_json (1.7.4) + multi_json (1.8.0) net-http-local (0.1.2) net-purge (0.1.0) net-scp (1.1.1) @@ -204,11 +204,13 @@ GEM ruby-ole (>= 1.2.8) vpim (>= 0.360) ruby-ole (1.2.11.6) - sass (3.2.9) - sass-rails (3.1.0) + sass (3.2.10) + sass-rails (3.1.4) actionpack (~> 3.1.0) railties (~> 3.1.0) sass (>= 3.1.4) + sprockets (~> 2.0.0) + tilt (~> 1.3.2) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) @@ -240,7 +242,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.14.6) - tilt (1.4.1) + tilt (1.3.7) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -302,7 +304,7 @@ DEPENDENCIES rspec-rails ruby-debug ruby-msg (~> 1.5.0) - sass-rails (~> 3.1) + sass-rails (= 3.1.4) spork-rails statistics2 (~> 0.54) syslog_protocol |