Browse Source

update dependencies

pull/1/head
Nicolae Claudius 13 years ago
parent
commit
9d4e8d30c7
  1. 4
      Gemfile
  2. 15
      Gemfile.lock

4
Gemfile

@ -12,8 +12,8 @@ gem 'cancan', '~> 1.6.7'
gem 'squeel', '~> 0.9.3'
gem 'sentient_user', '~> 0.3.2'
gem 'userstamp_basic', '~> 0.1.0'
gem 'active_scaffold', :git => 'https://github.com/activescaffold/active_scaffold.git'
# '~> 3.1.14'
gem 'active_scaffold', '~> 3.1.20'
# :git => 'https://github.com/activescaffold/active_scaffold.git'
# :path => '/home/clyfe/dev/active_scaffold'
gem 'pjax_rails', '~> 0.1.10'
gem 'validates_hostname', '~> 1.0.0', :git => 'https://github.com/KimNorgaard/validates_hostname.git'

15
Gemfile.lock

@ -4,13 +4,6 @@ GIT
specs:
validates_hostname (1.0.0)
GIT
remote: https://github.com/activescaffold/active_scaffold.git
revision: 090aaf46e046534d64bf3d2ccf3671e26fc1995e
specs:
active_scaffold (3.1.18)
rails (>= 3.1.3)
GEM
remote: http://rubygems.org/
specs:
@ -30,6 +23,8 @@ GEM
active-model-email-validator (1.0.2)
activemodel
mail
active_scaffold (3.1.20)
rails (>= 3.1.3)
activemodel (3.2.0)
activesupport (= 3.2.0)
builder (~> 3.0.0)
@ -73,7 +68,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.2.0)
compass (0.12.alpha.4)
compass (0.12.rc.0)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
@ -103,7 +98,7 @@ GEM
thor (~> 0.14.6)
guard-rspec (0.6.0)
guard (>= 0.10.0)
guard-spork (0.5.1)
guard-spork (0.5.2)
guard (>= 0.10.0)
spork (>= 0.8.4)
highline (1.6.11)
@ -235,7 +230,7 @@ PLATFORMS
DEPENDENCIES
active-model-email-validator (~> 1.0.2)
active_scaffold!
active_scaffold (~> 3.1.20)
cancan (~> 1.6.7)
capistrano (~> 2.9.0)
capistrano-ext (~> 1.2.1)

Loading…
Cancel
Save