Bundle update
This commit is contained in:
parent
93be8372ed
commit
56ebb9f787
2
Gemfile
2
Gemfile
@ -114,7 +114,7 @@ group :development, :test, :assets do
|
||||
# bundle exec rake doc:rails generates the API under doc/api.
|
||||
gem 'sdoc', '~> 0.4.0', group: :doc
|
||||
|
||||
gem 'compass-rails', '~> 2.0.4'
|
||||
gem 'compass-rails'
|
||||
gem 'modernizr-rails'
|
||||
|
||||
# Patch older browsers so they do understand html5
|
||||
|
30
Gemfile.lock
30
Gemfile.lock
@ -117,10 +117,9 @@ GEM
|
||||
sass (>= 3.3.0, < 3.5)
|
||||
compass-import-once (1.0.5)
|
||||
sass (>= 3.2, < 3.5)
|
||||
compass-rails (2.0.4)
|
||||
compass-rails (2.0.1)
|
||||
compass (~> 1.0.0)
|
||||
sass-rails (<= 5.0.1)
|
||||
sprockets (< 2.13)
|
||||
concurrent-ruby (1.0.0)
|
||||
debug_inspector (0.0.2)
|
||||
devise (3.5.3)
|
||||
bcrypt (~> 3.0)
|
||||
@ -204,7 +203,6 @@ GEM
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
highline (1.7.8)
|
||||
hike (1.2.3)
|
||||
html2haml (2.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
haml (~> 4.0.0)
|
||||
@ -354,12 +352,12 @@ GEM
|
||||
sexp_processor (~> 4.1)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.20)
|
||||
sass-rails (5.0.1)
|
||||
sass-rails (5.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (~> 1.1)
|
||||
tilt (>= 1.1, < 3)
|
||||
sdoc (0.4.1)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
rdoc (~> 4.0)
|
||||
@ -380,15 +378,13 @@ GEM
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
slop (3.6.0)
|
||||
spring (1.6.1)
|
||||
sprockets (2.12.4)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.3.3)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets (3.5.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.0.0)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
sqlite3 (1.3.11)
|
||||
strip_attributes (1.7.1)
|
||||
activemodel (>= 3.0, < 5.0)
|
||||
@ -400,7 +396,7 @@ GEM
|
||||
ref
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
tilt (1.4.1)
|
||||
tilt (2.0.2)
|
||||
tins (1.6.0)
|
||||
tinymce-rails (4.3.2)
|
||||
railties (>= 3.1.1)
|
||||
@ -448,7 +444,7 @@ DEPENDENCIES
|
||||
brakeman
|
||||
byebug
|
||||
coffee-rails
|
||||
compass-rails (~> 2.0.4)
|
||||
compass-rails
|
||||
devise
|
||||
devise-i18n
|
||||
differ
|
||||
|
Loading…
Reference in New Issue
Block a user