Skip to content
Extraits de code Groupes Projets
Valider 1d4af309 rédigé par echarp's avatar echarp
Parcourir les fichiers

Bundle update

parent 13592425
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -20,7 +20,8 @@ gem 'jbuilder'
gem 'haml-rails'
gem 'devise'
# Latest versions break active admin!
gem 'devise', '< 4.0'
gem 'devise-i18n'
gem 'rails-i18n'
# Store some specific content, like application name and static pages contents
......
......@@ -83,7 +83,7 @@ GEM
arel (6.0.3)
ast (2.2.0)
bcrypt (3.1.11)
bourbon (4.2.6)
bourbon (4.2.7)
sass (~> 3.4)
thor (~> 0.19)
brakeman (3.2.1)
......@@ -122,7 +122,7 @@ GEM
sass (>= 3.2, < 3.5)
concurrent-ruby (1.0.1)
debug_inspector (0.0.2)
devise (3.5.6)
devise (3.5.7)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
......@@ -245,7 +245,7 @@ GEM
railties (>= 3.1)
leaflet-rails (0.7.7)
libv8 (3.16.14.13)
listen (3.0.6)
listen (3.1.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
loofah (2.0.3)
......@@ -265,7 +265,7 @@ GEM
modernizr-rails (2.7.1)
multi_json (1.11.2)
multipart-post (2.0.0)
mysql2 (0.4.3)
mysql2 (0.4.4)
naught (1.1.0)
nenv (0.3.0)
nokogiri (1.6.7.2)
......@@ -377,7 +377,7 @@ GEM
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
spring (1.6.4)
spring (1.7.1)
sprockets (3.6.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
......@@ -443,7 +443,7 @@ DEPENDENCIES
byebug
coffee-rails
compass-rails!
devise
devise (< 4.0)
devise-i18n
differ
email_validator
......
......@@ -43,4 +43,7 @@ Rails.application.configure do
# Add Rack::LiveReload to the bottom of the middleware stack with the default
# options.
config.middleware.insert_after ActionDispatch::Static, Rack::LiveReload
# To have assets Local Precompilation, we need to use another path in dev
config.assets.prefix = '/dev-assets'
end
......@@ -31,13 +31,13 @@ if File.file? 'Rakefile'
end
# precompile assets
changed_assets = `git diff #{oldrev} #{newrev} --name-only -z app/assets`
.split("\0")
# changed_assets = `git diff #{oldrev} #{newrev} --name-only -z app/assets`
# .split("\0")
task = 'assets:precompile'
unless changed_assets.empty?
run "#{rake_cmd} #{task} RAILS_ENV=#{RAILS_ENV} RAILS_GROUPS=assets"
end
# task = 'assets:precompile'
# unless changed_assets.empty?
# run "#{rake_cmd} #{task} RAILS_ENV=#{RAILS_ENV} RAILS_GROUPS=assets"
# end
end
# clear cached assets (unversioned/ignored files)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter