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

Bundle updated

parent 795b7f64
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Gemfile
+ 1
− 6
Voir le fichier @ 4b839ee7
...@@ -41,6 +41,7 @@ end ...@@ -41,6 +41,7 @@ end
# gem 'debugger', group: [:development, :test] # gem 'debugger', group: [:development, :test]
gem 'haml-rails' gem 'haml-rails'
gem 'compass-rails', '1.1.3'
gem 'activeadmin', github: 'gregbell/active_admin' gem 'activeadmin', github: 'gregbell/active_admin'
gem 'rails-i18n' gem 'rails-i18n'
gem 'devise-i18n' gem 'devise-i18n'
...@@ -50,12 +51,6 @@ gem 'has_scope' ...@@ -50,12 +51,6 @@ gem 'has_scope'
gem 'simple_calendar', github: 'echarp/simple_calendar' gem 'simple_calendar', github: 'echarp/simple_calendar'
gem 'redcarpet' gem 'redcarpet'
group :assets do
# Use SASS for stylesheets
gem 'sass-rails'
gem 'compass-rails'
end
group :development do group :development do
gem 'guard-livereload' gem 'guard-livereload'
gem 'guard-bundler' gem 'guard-bundler'
......
Gemfile.lock
+ 37
− 36
Voir le fichier @ 4b839ee7
...@@ -7,7 +7,7 @@ GIT ...@@ -7,7 +7,7 @@ GIT
GIT GIT
remote: git://github.com/gregbell/active_admin.git remote: git://github.com/gregbell/active_admin.git
revision: d7a26247de866fba5e3d2cce872ba978247f80a2 revision: 3136ccb910e8d1dba929514c6e9df2b190cacd6d
specs: specs:
activeadmin (1.0.0.pre) activeadmin (1.0.0.pre)
arbre (~> 1.0) arbre (~> 1.0)
...@@ -26,25 +26,25 @@ GIT ...@@ -26,25 +26,25 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.0.2) actionmailer (4.0.3)
actionpack (= 4.0.2) actionpack (= 4.0.3)
mail (~> 2.5.4) mail (~> 2.5.4)
actionpack (4.0.2) actionpack (4.0.3)
activesupport (= 4.0.2) activesupport (= 4.0.3)
builder (~> 3.1.0) builder (~> 3.1.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
activemodel (4.0.2) activemodel (4.0.3)
activesupport (= 4.0.2) activesupport (= 4.0.3)
builder (~> 3.1.0) builder (~> 3.1.0)
activerecord (4.0.2) activerecord (4.0.3)
activemodel (= 4.0.2) activemodel (= 4.0.3)
activerecord-deprecated_finders (~> 1.0.2) activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.2) activesupport (= 4.0.3)
arel (~> 4.0.0) arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3) activerecord-deprecated_finders (1.0.3)
activesupport (4.0.2) activesupport (4.0.3)
i18n (~> 0.6, >= 0.6.4) i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2) minitest (~> 4.2)
multi_json (~> 1.3) multi_json (~> 1.3)
...@@ -53,8 +53,10 @@ GEM ...@@ -53,8 +53,10 @@ GEM
arbre (1.0.1) arbre (1.0.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
arel (4.0.2) arel (4.0.2)
atomic (1.1.14) atomic (1.1.15)
bcrypt-ruby (3.1.2) bcrypt (3.1.7)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
bourbon (3.1.8) bourbon (3.1.8)
sass (>= 3.2.0) sass (>= 3.2.0)
thor thor
...@@ -77,9 +79,9 @@ GEM ...@@ -77,9 +79,9 @@ GEM
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
sass (~> 3.1) sass (~> 3.1)
compass-rails (1.1.4) compass-rails (1.1.3)
compass (>= 0.12.2) compass (>= 0.12.2)
devise (3.2.2) devise (3.2.3)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 3.2.6, < 5)
...@@ -99,9 +101,9 @@ GEM ...@@ -99,9 +101,9 @@ GEM
formtastic (2.3.0.rc2) formtastic (2.3.0.rc2)
actionpack (>= 3.0) actionpack (>= 3.0)
fssm (0.2.10) fssm (0.2.10)
guard (2.4.0) guard (2.5.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (~> 2.1) listen (~> 2.6)
lumberjack (~> 1.0) lumberjack (~> 1.0)
pry (>= 0.9.12) pry (>= 0.9.12)
thor (>= 0.18.1) thor (>= 0.18.1)
...@@ -140,13 +142,13 @@ GEM ...@@ -140,13 +142,13 @@ GEM
jquery-turbolinks (2.0.2) jquery-turbolinks (2.0.2)
railties (>= 3.1.0) railties (>= 3.1.0)
turbolinks turbolinks
jquery-ui-rails (4.1.1) jquery-ui-rails (4.2.0)
railties (>= 3.1.0) railties (>= 3.2.16)
json (1.8.1) json (1.8.1)
kaminari (0.15.1) kaminari (0.15.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
listen (2.5.0) listen (2.6.2)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0) celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
...@@ -164,7 +166,7 @@ GEM ...@@ -164,7 +166,7 @@ GEM
orm_adapter (0.5.0) orm_adapter (0.5.0)
polyamorous (0.6.4) polyamorous (0.6.4)
activerecord (>= 3.0) activerecord (>= 3.0)
polyglot (0.3.3) polyglot (0.3.4)
pry (0.9.12.6) pry (0.9.12.6)
coderay (~> 1.0) coderay (~> 1.0)
method_source (~> 0.8) method_source (~> 0.8)
...@@ -174,20 +176,20 @@ GEM ...@@ -174,20 +176,20 @@ GEM
rack (1.5.2) rack (1.5.2)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.0.2) rails (4.0.3)
actionmailer (= 4.0.2) actionmailer (= 4.0.3)
actionpack (= 4.0.2) actionpack (= 4.0.3)
activerecord (= 4.0.2) activerecord (= 4.0.3)
activesupport (= 4.0.2) activesupport (= 4.0.3)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2) railties (= 4.0.3)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
rails-i18n (4.0.1) rails-i18n (4.0.1)
i18n (~> 0.6) i18n (~> 0.6)
rails (~> 4.0) rails (~> 4.0)
railties (4.0.2) railties (4.0.3)
actionpack (= 4.0.2) actionpack (= 4.0.3)
activesupport (= 4.0.2) activesupport (= 4.0.3)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.1.1) rake (10.1.1)
...@@ -200,7 +202,7 @@ GEM ...@@ -200,7 +202,7 @@ GEM
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (4.1.1) rdoc (4.1.1)
json (~> 1.4) json (~> 1.4)
redcarpet (3.1.0) redcarpet (3.1.1)
responders (1.0.0) responders (1.0.0)
railties (>= 3.2, < 5) railties (>= 3.2, < 5)
sass (3.2.14) sass (3.2.14)
...@@ -212,7 +214,7 @@ GEM ...@@ -212,7 +214,7 @@ GEM
json (~> 1.8) json (~> 1.8)
rdoc (~> 4.0, < 5.0) rdoc (~> 4.0, < 5.0)
slop (3.4.7) slop (3.4.7)
sprockets (2.10.1) sprockets (2.11.0)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
...@@ -222,8 +224,8 @@ GEM ...@@ -222,8 +224,8 @@ GEM
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
thor (0.18.1.20140116) thor (0.18.1.20140116)
thread_safe (0.1.3) thread_safe (0.2.0)
atomic atomic (>= 1.1.7, < 2)
tilt (1.4.1) tilt (1.4.1)
timers (1.1.0) timers (1.1.0)
treetop (1.4.15) treetop (1.4.15)
...@@ -245,7 +247,7 @@ PLATFORMS ...@@ -245,7 +247,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
activeadmin! activeadmin!
coffee-rails coffee-rails
compass-rails compass-rails (= 1.1.3)
devise-i18n devise-i18n
font-awesome-rails font-awesome-rails
guard-bundler guard-bundler
...@@ -261,7 +263,6 @@ DEPENDENCIES ...@@ -261,7 +263,6 @@ DEPENDENCIES
rails rails
rails-i18n rails-i18n
redcarpet redcarpet
sass-rails
sdoc sdoc
simple_calendar! simple_calendar!
turbolinks turbolinks
......
0% 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