fixes #1158
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -11,7 +11,7 @@ end
|
||||
group :assets do
|
||||
gem "sass-rails"
|
||||
gem "uglifier", ">= 1.0.3"
|
||||
gem "therubyracer"
|
||||
# gem "therubyracer"
|
||||
end
|
||||
|
||||
gem "rails", "3.2.12"
|
||||
|
||||
76
Gemfile.lock
76
Gemfile.lock
@@ -60,30 +60,29 @@ GEM
|
||||
mime-types
|
||||
xml-simple
|
||||
bcrypt-ruby (3.0.1)
|
||||
bourne (1.1.2)
|
||||
mocha (= 0.10.5)
|
||||
bourne (1.4.0)
|
||||
mocha (~> 0.13.2)
|
||||
builder (3.0.4)
|
||||
chronic (0.9.0)
|
||||
coderay (1.0.8)
|
||||
chronic (0.9.1)
|
||||
coderay (1.0.9)
|
||||
daemons (1.1.9)
|
||||
delayed_job (3.0.5)
|
||||
activesupport (~> 3.0)
|
||||
delayed_job_active_record (0.4.1)
|
||||
delayed_job_active_record (0.4.3)
|
||||
activerecord (>= 2.1.0, < 4)
|
||||
delayed_job (~> 3.0)
|
||||
diff-lcs (1.2.1)
|
||||
domain_name (0.5.7)
|
||||
unf (~> 0.0.3)
|
||||
diff-lcs (1.2.2)
|
||||
domain_name (0.5.10)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
erubis (2.7.0)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
factory_girl (4.2.0)
|
||||
activesupport (>= 3.0.0)
|
||||
hike (1.2.1)
|
||||
i18n (0.6.1)
|
||||
i18n (0.6.4)
|
||||
journey (1.0.4)
|
||||
json (1.7.7)
|
||||
libv8 (3.11.8.13)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
@@ -91,17 +90,17 @@ GEM
|
||||
memcache-client (1.8.5)
|
||||
metaclass (0.0.1)
|
||||
method_source (0.8.1)
|
||||
mime-types (1.21)
|
||||
mocha (0.10.5)
|
||||
mime-types (1.22)
|
||||
mocha (0.13.3)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.6.0)
|
||||
net-http-digest_auth (1.2.1)
|
||||
multi_json (1.7.2)
|
||||
net-http-digest_auth (1.3)
|
||||
net-http-persistent (2.8)
|
||||
net-sftp (2.1.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.6.5)
|
||||
newrelic_rpm (3.5.5.38)
|
||||
nokogiri (1.5.6)
|
||||
net-ssh (2.6.6)
|
||||
newrelic_rpm (3.6.0.78)
|
||||
nokogiri (1.5.9)
|
||||
ntlm-http (0.1.1)
|
||||
pg (0.12.2)
|
||||
polyglot (0.3.3)
|
||||
@@ -131,54 +130,50 @@ GEM
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.0.3)
|
||||
rdoc (3.12.1)
|
||||
rake (10.0.4)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
ref (1.0.2)
|
||||
rmagick (2.13.2)
|
||||
ruby-prof (0.12.2)
|
||||
sass (3.2.5)
|
||||
ruby-prof (0.13.0)
|
||||
sass (3.2.7)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
shoulda (3.3.2)
|
||||
shoulda-context (~> 1.0.1)
|
||||
shoulda-matchers (~> 1.4.1)
|
||||
shoulda-context (1.0.2)
|
||||
shoulda-matchers (1.4.2)
|
||||
shoulda (3.4.0)
|
||||
shoulda-context (~> 1.0, >= 1.0.1)
|
||||
shoulda-matchers (~> 1.0, >= 1.4.1)
|
||||
shoulda-context (1.1.0)
|
||||
shoulda-matchers (1.5.6)
|
||||
activesupport (>= 3.0.0)
|
||||
bourne (~> 1.1.2)
|
||||
simple_form (2.0.4)
|
||||
bourne (~> 1.3)
|
||||
simple_form (2.1.0)
|
||||
actionpack (~> 3.0)
|
||||
activemodel (~> 3.0)
|
||||
simplecov (0.7.1)
|
||||
multi_json (~> 1.0)
|
||||
simplecov-html (~> 0.7.1)
|
||||
simplecov-html (0.7.1)
|
||||
slop (3.4.3)
|
||||
slop (3.4.4)
|
||||
sprockets (2.2.2)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
term-ansicolor (1.0.7)
|
||||
therubyracer (0.11.3)
|
||||
libv8 (~> 3.11.8.12)
|
||||
ref
|
||||
thor (0.17.0)
|
||||
tilt (1.3.3)
|
||||
term-ansicolor (1.1.4)
|
||||
thor (0.18.1)
|
||||
tilt (1.3.6)
|
||||
treetop (1.4.12)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.35)
|
||||
tzinfo (0.3.37)
|
||||
uglifier (1.3.0)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
unf (0.0.5)
|
||||
unf (0.1.1)
|
||||
unf_ext
|
||||
unf_ext (0.0.5)
|
||||
webrobots (0.0.13)
|
||||
unf_ext (0.0.6)
|
||||
webrobots (0.1.1)
|
||||
whenever (0.8.2)
|
||||
activesupport (>= 2.3.4)
|
||||
chronic (>= 0.6.3)
|
||||
@@ -215,6 +210,5 @@ DEPENDENCIES
|
||||
simple_form
|
||||
simplecov
|
||||
term-ansicolor
|
||||
therubyracer
|
||||
uglifier (>= 1.0.3)
|
||||
whenever
|
||||
|
||||
Reference in New Issue
Block a user