Bundle update

recurrent
echarp 8 years ago
parent 3fc4dce87c
commit 957c46c11b
  1. 7
      Gemfile
  2. 50
      Gemfile.lock

@ -50,13 +50,10 @@ gem 'haml-rails'
gem 'compass-rails'
gem 'modernizr-rails'
gem 'activeadmin', github: 'gregbell/active_admin'
# To correct some 4.1 issue with active_admin:
gem 'polyamorous', github: 'activerecord-hackery/polyamorous'
gem "formtastic", github: "justinfrench/formtastic"
gem "ransack", github: "activerecord-hackery/ransack", branch: "rails-4.1"
gem 'rails-i18n'
gem 'devise'
gem 'devise-i18n'
gem 'rails-i18n'
# Store some specific content, like application name and some important documentation
gem 'i18n-active_record',
git: 'git://github.com/svenfuchs/i18n-active_record.git',

@ -1,22 +1,3 @@
GIT
remote: git://github.com/activerecord-hackery/polyamorous.git
revision: 69ce1f436ee93dcb011631bb727a6e3ab38a27f4
specs:
polyamorous (1.0.0)
activerecord (>= 3.0)
GIT
remote: git://github.com/activerecord-hackery/ransack.git
revision: 79fe700bca7d69f30a44898635fdddd3a8ef486d
branch: rails-4.1
specs:
ransack (1.2.4)
actionpack (>= 4.0)
activerecord (>= 4.0)
activesupport (>= 4.0)
i18n
polyamorous (~> 1.0.0)
GIT
remote: git://github.com/echarp/simple_calendar.git
revision: 415838f60847068bc29459f5a275c04d4db05ee9
@ -41,13 +22,6 @@ GIT
ransack (~> 1.0)
sass-rails
GIT
remote: git://github.com/justinfrench/formtastic.git
revision: 1bdf6d3642af52a1a62902f12b844a5856d0254e
specs:
formtastic (2.3.0.rc3)
actionpack (>= 3.2.13)
GIT
remote: git://github.com/svenfuchs/i18n-active_record.git
revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc
@ -87,6 +61,7 @@ GEM
arbre (1.0.1)
activesupport (>= 3.0.0)
arel (5.0.1.20140414130214)
bcrypt (3.1.7)
bourbon (3.2.1)
sass (~> 3.2)
thor
@ -109,6 +84,12 @@ GEM
compass-rails (1.1.7)
compass (>= 0.12.2)
sprockets (<= 2.11.0)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-i18n (0.10.3)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
@ -120,6 +101,8 @@ GEM
font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0)
formatador (0.2.4)
formtastic (2.3.0.rc3)
actionpack (>= 3.0)
fssm (0.2.10)
gritter (1.1.0)
guard (2.6.1)
@ -185,6 +168,9 @@ GEM
mysql2 (0.3.16)
openlayers-rails (0.0.4)
railties (>= 3.1)
orm_adapter (0.5.0)
polyamorous (1.0.0)
activerecord (>= 3.0)
polyglot (0.3.4)
pry (0.9.12.6)
coderay (~> 1.0)
@ -214,6 +200,12 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
ransack (1.2.3)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.0.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
ffi (>= 0.5.0)
@ -256,6 +248,8 @@ GEM
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
rack (>= 1.0)
webrick (1.3.1)
PLATFORMS
@ -265,9 +259,9 @@ DEPENDENCIES
activeadmin!
coffee-rails
compass-rails
devise
devise-i18n
font-awesome-rails
formtastic!
gritter
guard-bundler
guard-livereload
@ -280,11 +274,9 @@ DEPENDENCIES
modernizr-rails
mysql2
openlayers-rails
polyamorous!
quiet_assets
rails (~> 4.1.0.rc1)
rails-i18n
ransack!
redcarpet
sass-rails (~> 4.0.1)
sdoc (~> 0.4.0)

Loading…
Cancel
Save