83 lines
2.1 KiB
Diff
83 lines
2.1 KiB
Diff
|
--- a/Gemfile 2013-09-10 00:16:33.951426871 +0200
|
||
|
|
+++ b/Gemfile 2013-09-10 01:02:00.745109650 +0200
|
||
|
|
@@ -120,11 +120,14 @@
|
||
|
|
# Sanitize user input
|
||
|
|
gem "sanitize"
|
||
|
|
|
||
|
|
+# The newer revision of charlock_holmes that is finally fixed to
|
||
|
|
+# be compatible with Gentoo
|
||
|
|
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
|
||
|
|
+
|
||
|
|
group :assets do
|
||
|
|
gem "sass-rails"
|
||
|
|
gem "coffee-rails"
|
||
|
|
gem "uglifier"
|
||
|
|
- gem "therubyracer"
|
||
|
|
gem 'turbolinks'
|
||
|
|
gem 'jquery-turbolinks'
|
||
|
|
|
||
|
|
--- a/Gemfile.lock 2013-09-10 00:16:40.079441559 +0200
|
||
|
|
+++ b/Gemfile.lock 2013-09-10 01:03:51.837297421 +0200
|
||
|
|
@@ -1,4 +1,11 @@
|
||
|
|
GIT
|
||
|
|
+ remote: https://github.com/brianmario/charlock_holmes.git
|
||
|
|
+ revision: dde194609b3513b0d2369ce8f916ae52566154b4
|
||
|
|
+ ref: dde194609b3513b0d2369ce8f916ae52566154b4
|
||
|
|
+ specs:
|
||
|
|
+ charlock_holmes (0.6.9.4)
|
||
|
|
+
|
||
|
|
+GIT
|
||
|
|
remote: https://github.com/ctran/annotate_models.git
|
||
|
|
revision: 18a4e2eb77c8f3ef695b563e4a7ca45dfede819b
|
||
|
|
specs:
|
||
|
|
@@ -69,7 +76,6 @@
|
||
|
|
activesupport (>= 3.2.0)
|
||
|
|
celluloid (0.14.1)
|
||
|
|
timers (>= 1.0.0)
|
||
|
|
- charlock_holmes (0.6.9.4)
|
||
|
|
childprocess (0.3.9)
|
||
|
|
ffi (~> 1.0, >= 1.0.11)
|
||
|
|
chosen-rails (1.0.0)
|
||
|
|
@@ -271,7 +277,6 @@
|
||
|
|
addressable (~> 2.3)
|
||
|
|
letter_opener (1.1.1)
|
||
|
|
launchy (~> 2.2)
|
||
|
|
- libv8 (3.11.8.17)
|
||
|
|
listen (1.2.2)
|
||
|
|
rb-fsevent (>= 0.9.3)
|
||
|
|
rb-inotify (>= 0.9)
|
||
|
|
@@ -407,7 +412,6 @@
|
||
|
|
redis-store (~> 1.1.0)
|
||
|
|
redis-store (1.1.3)
|
||
|
|
redis (>= 2.2.0)
|
||
|
|
- ref (1.0.5)
|
||
|
|
rest-client (1.6.7)
|
||
|
|
mime-types (>= 1.16)
|
||
|
|
rspec (2.13.0)
|
||
|
|
@@ -493,9 +497,6 @@
|
||
|
|
stringex (1.5.1)
|
||
|
|
temple (0.6.5)
|
||
|
|
test_after_commit (0.2.0)
|
||
|
|
- therubyracer (0.11.4)
|
||
|
|
- libv8 (~> 3.11.8.12)
|
||
|
|
- ref
|
||
|
|
thin (1.5.1)
|
||
|
|
daemons (>= 1.0.9)
|
||
|
|
eventmachine (>= 0.12.6)
|
||
|
|
@@ -556,6 +557,7 @@
|
||
|
|
bootstrap-sass
|
||
|
|
capybara
|
||
|
|
carrierwave
|
||
|
|
+ charlock_holmes!
|
||
|
|
chosen-rails (= 1.0.0)
|
||
|
|
coffee-rails
|
||
|
|
colored
|
||
|
|
@@ -634,7 +636,6 @@
|
||
|
|
stamp
|
||
|
|
state_machine
|
||
|
|
test_after_commit
|
||
|
|
- therubyracer
|
||
|
|
thin
|
||
|
|
tinder (~> 1.9.2)
|
||
|
|
turbolinks
|