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

Bundle update

parent 41082be6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -98,10 +98,12 @@ group :development do ...@@ -98,10 +98,12 @@ group :development do
gem 'sqlite3' gem 'sqlite3'
gem 'guard-livereload' gem 'guard-livereload'
gem 'guard-migrate'
gem 'guard-bundler' gem 'guard-bundler'
gem 'guard-minitest' gem 'guard-minitest'
gem 'quiet_assets' gem 'quiet_assets'
gem 'guard-rubocop' gem 'guard-rubocop'
gem 'haml-lint'
gem 'webrick', '>= 1.3.1' gem 'webrick', '>= 1.3.1'
# Security checks # Security checks
gem 'brakeman', require: false gem 'brakeman', require: false
......
GIT GIT
remote: git://github.com/activeadmin/activeadmin.git remote: git://github.com/activeadmin/activeadmin.git
revision: 8c87611980fa3de9e26ca9e02df3712032f9825c revision: 85c26616468266fda0c3762a507a7ea68b9b2fec
specs: specs:
activeadmin (1.0.0.pre) activeadmin (1.0.0.pre)
arbre (~> 1.0, >= 1.0.2) arbre (~> 1.0, >= 1.0.2)
...@@ -127,13 +127,13 @@ GEM ...@@ -127,13 +127,13 @@ GEM
responders responders
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise-i18n (0.11.2) devise-i18n (0.11.3)
differ (0.1.2) differ (0.1.2)
docile (1.1.5) docile (1.1.5)
em-websocket (0.5.1) em-websocket (0.5.1)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
email_validator (1.4.0) email_validator (1.5.0)
activemodel activemodel
equalizer (0.0.9) equalizer (0.0.9)
erubis (2.7.0) erubis (2.7.0)
...@@ -150,7 +150,7 @@ GEM ...@@ -150,7 +150,7 @@ GEM
actionpack (>= 3.2.13) actionpack (>= 3.2.13)
formtastic_i18n (0.1.1) formtastic_i18n (0.1.1)
geocoder (1.2.6) geocoder (1.2.6)
guard (2.10.0) guard (2.10.2)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (~> 2.7) listen (~> 2.7)
lumberjack (~> 1.0) lumberjack (~> 1.0)
...@@ -159,21 +159,30 @@ GEM ...@@ -159,21 +159,30 @@ GEM
guard-brakeman (0.8.3) guard-brakeman (0.8.3)
brakeman (>= 2.1.1) brakeman (>= 2.1.1)
guard (>= 2.0.0) guard (>= 2.0.0)
guard-bundler (2.0.0) guard-bundler (2.1.0)
bundler (~> 1.0) bundler (~> 1.0)
guard (~> 2.2) guard (~> 2.2)
guard-compat (~> 1.1)
guard-compat (1.1.0)
guard-livereload (2.4.0) guard-livereload (2.4.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
guard (~> 2.8) guard (~> 2.8)
multi_json (~> 1.8) multi_json (~> 1.8)
guard-migrate (1.2.0)
activerecord (>= 4.1.0)
guard (>= 2.3.0)
guard-minitest (2.3.2) guard-minitest (2.3.2)
guard (~> 2.0) guard (~> 2.0)
minitest (>= 3.0) minitest (>= 3.0)
guard-rubocop (1.2.0) guard-rubocop (1.2.0)
guard (~> 2.0) guard (~> 2.0)
rubocop (~> 0.20) rubocop (~> 0.20)
haml (4.0.5) haml (4.0.6)
tilt tilt
haml-lint (0.9.0)
haml (~> 4.0)
rubocop (>= 0.25.0)
sysexits (~> 1.1)
haml-rails (0.5.3) haml-rails (0.5.3)
actionpack (>= 4.0.1) actionpack (>= 4.0.1)
activesupport (>= 4.0.1) activesupport (>= 4.0.1)
...@@ -268,7 +277,7 @@ GEM ...@@ -268,7 +277,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
rake (10.4.0) rake (10.4.2)
ransack (1.5.1) ransack (1.5.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activerecord (>= 3.0) activerecord (>= 3.0)
...@@ -278,13 +287,13 @@ GEM ...@@ -278,13 +287,13 @@ GEM
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (4.1.2) rdoc (4.2.0)
json (~> 1.4) json (~> 1.4)
redcarpet (3.2.1) redcarpet (3.2.2)
ref (1.0.5) ref (1.0.5)
responders (1.1.2) responders (1.1.2)
railties (>= 3.2, < 4.2) railties (>= 3.2, < 4.2)
rubocop (0.27.1) rubocop (0.28.0)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.0.pre.7, < 3.0) parser (>= 2.2.0.pre.7, < 3.0)
powerpack (~> 0.0.6) powerpack (~> 0.0.6)
...@@ -331,6 +340,7 @@ GEM ...@@ -331,6 +340,7 @@ GEM
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10) sqlite3 (1.3.10)
sysexits (1.2.0)
temple (0.6.10) temple (0.6.10)
terminal-table (1.4.5) terminal-table (1.4.5)
therubyracer (0.12.1) therubyracer (0.12.1)
...@@ -345,7 +355,7 @@ GEM ...@@ -345,7 +355,7 @@ GEM
railties (>= 3.1.1) railties (>= 3.1.1)
tinymce-rails-langs (4.20140129) tinymce-rails-langs (4.20140129)
tinymce-rails (~> 4.0) tinymce-rails (~> 4.0)
turbolinks (2.5.2) turbolinks (2.5.3)
coffee-rails coffee-rails
twitter (5.13.0) twitter (5.13.0)
addressable (~> 2.3) addressable (~> 2.3)
...@@ -360,7 +370,7 @@ GEM ...@@ -360,7 +370,7 @@ GEM
simple_oauth (~> 0.3.0) simple_oauth (~> 0.3.0)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.3) uglifier (2.6.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
warden (1.2.3) warden (1.2.3)
...@@ -390,8 +400,10 @@ DEPENDENCIES ...@@ -390,8 +400,10 @@ DEPENDENCIES
guard-brakeman guard-brakeman
guard-bundler guard-bundler
guard-livereload guard-livereload
guard-migrate
guard-minitest guard-minitest
guard-rubocop guard-rubocop
haml-lint
haml-rails haml-rails
has_scope has_scope
http_accept_language http_accept_language
......
...@@ -40,3 +40,8 @@ guard :rubocop, cli: ['--rails'] do ...@@ -40,3 +40,8 @@ guard :rubocop, cli: ['--rails'] do
watch(%r{.+\.rb$}) watch(%r{.+\.rb$})
watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) } watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
end end
guard 'migrate' do
watch(%r{^db/migrate/(\d+).+\.rb})
watch('db/seeds.rb')
end
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