agenda-libre/agenda-libre-ruby
agenda-libre
/
agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Passage à sass-rails 5 beta 1

This commit is contained in:
echarp 2014-10-21 23:40:54 +02:00
parent 78acc76e35
commit bf6f6e84b3
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@ -4,11 +4,9 @@ source 'https://rubygems.org'
gem 'simple_calendar' gem 'simple_calendar'
gem 'rails' gem 'rails'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.3'
# Use Uglifier as compressor for JavaScript assets # Use SCSS for stylesheets
gem 'uglifier' gem 'sass-rails', '~> 5.0.0.beta1'
# Use CoffeeScript for .js.coffee assets and views # Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails' gem 'coffee-rails'
@ -24,6 +22,8 @@ gem 'jquery-rails'
gem 'turbolinks' gem 'turbolinks'
gem 'jquery-turbolinks' gem 'jquery-turbolinks'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0' gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api. # bundle exec rake doc:rails generates the API under doc/api.

37
Gemfile.lock
View File

@ -78,8 +78,8 @@ GEM
rack (>= 0.9.0) rack (>= 0.9.0)
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bourbon (3.2.3) bourbon (4.0.2)
sass (~> 3.2) sass (~> 3.3)
thor thor
brakeman (2.6.3) brakeman (2.6.3)
erubis (~> 2.6) erubis (~> 2.6)
@ -105,12 +105,20 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.8.0) coffee-script-source (1.8.0)
compass (0.12.7) compass (1.0.1)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) compass-core (~> 1.0.1)
sass (~> 3.2.19) compass-import-once (~> 1.0.5)
compass-rails (2.0.0) rb-fsevent (>= 0.9.3)
compass (>= 0.12.2) rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.1)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
compass-rails (2.0.1)
compass (~> 1.0.0)
debug_inspector (0.0.2) debug_inspector (0.0.2)
devise (3.4.0) devise (3.4.0)
bcrypt (~> 3.0) bcrypt (~> 3.0)
@ -141,7 +149,6 @@ GEM
formtastic (3.0.0) formtastic (3.0.0)
actionpack (>= 3.2.13) actionpack (>= 3.2.13)
formtastic_i18n (0.1.1) formtastic_i18n (0.1.1)
fssm (0.2.10)
geocoder (1.2.5) geocoder (1.2.5)
guard (2.6.1) guard (2.6.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
@ -285,12 +292,12 @@ GEM
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
ruby_parser (3.5.0) ruby_parser (3.5.0)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.2.19) sass (3.4.6)
sass-rails (4.0.3) sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0) sass (~> 3.2)
sprockets (~> 2.8, <= 2.11.0) sprockets (~> 2.12)
sprockets-rails (~> 2.0) sprockets-rails (>= 2.0, < 4.0)
sdoc (0.4.1) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
@ -310,7 +317,7 @@ GEM
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slop (3.6.0) slop (3.6.0)
spring (1.1.3) spring (1.1.3)
sprockets (2.11.0) sprockets (2.12.2)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
@ -396,7 +403,7 @@ DEPENDENCIES
rails rails
rails-i18n rails-i18n
redcarpet redcarpet
sass-rails (~> 4.0.3) sass-rails (~> 5.0.0.beta1)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
select2-rails select2-rails
simple_calendar simple_calendar