Skip to content

Commit

Permalink
Update dm-rails dependency to 1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jm81 committed Aug 12, 2010
1 parent 22b0c8c commit 41a0def
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -13,7 +13,7 @@ gem 'dm-migrations', '~> 1.0.0'
gem 'dm-sqlite-adapter', '~> 1.0.0'
gem 'dm-serializer', '~> 1.0.0'
gem 'dm-timestamps', '~> 1.0.0'
gem 'dm-rails', '~> 1.0.0', :git => 'git://github.com/datamapper/dm-rails'
gem 'dm-rails', '~> 1.0.3'

group :data_mapper do
gem 'dm-validations', '~> 1.0.0'
Expand Down
19 changes: 7 additions & 12 deletions Gemfile.lock
@@ -1,14 +1,3 @@
GIT
remote: git://github.com/datamapper/dm-rails
revision: e2ee760
specs:
dm-rails (1.0.0)
actionpack (~> 3.0.0.beta3)
activesupport (~> 3.0.0.beta3)
dm-active_model (~> 1.0.0)
dm-core (~> 1.0.0)
railties (~> 3.0.0.beta3)

GIT
remote: git://github.com/rails/rails.git
revision: 4952a80
Expand Down Expand Up @@ -75,6 +64,12 @@ GEM
dm-core (~> 1.0.0)
dm-migrations (1.0.0)
dm-core (~> 1.0.0)
dm-rails (1.0.3)
actionpack (~> 3.0.0.rc)
activesupport (~> 3.0.0.rc)
dm-active_model (~> 1.0.0)
dm-core (~> 1.0.0)
railties (~> 3.0.0.rc)
dm-serializer (1.0.0)
dm-core (~> 1.0.0)
fastercsv (~> 1.5.3)
Expand Down Expand Up @@ -134,7 +129,7 @@ DEPENDENCIES
bcrypt-ruby
dm-core (~> 1.0.0)
dm-migrations (~> 1.0.0)
dm-rails (~> 1.0.0)!
dm-rails (~> 1.0.3)
dm-serializer (~> 1.0.0)
dm-sqlite-adapter (~> 1.0.0)
dm-timestamps (~> 1.0.0)
Expand Down
5 changes: 2 additions & 3 deletions README.rdoc
Expand Up @@ -34,15 +34,14 @@ required (although devise version may differ)
gem 'dm-sqlite-adapter', '~> 1.0.0' # or your preferred adapter
gem 'dm-serializer', '~> 1.0.0'
gem 'dm-timestamps', '~> 1.0.0'
gem 'dm-rails', '~> 1.0.0', :git => 'git://github.com/datamapper/dm-rails'
gem 'dm-rails', '~> 1.0.3'
gem 'dm-validations', '~> 1.0.0' # Do not include if using data_mapper_active_model

gem 'devise', '~> 1.1.1'
gem 'dm-devise', '~> 1.1.0'

If you're using data_mapper_active_model do not include dm-validations in your
Gemfile. Note that it's fine to follow master on DM gems other than dm-rails,
but dm-rails is the only one where it's needed.
Gemfile.

Run the generator:

Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -58,7 +58,7 @@ begin
gem.add_dependency 'dm-validations', '~> 1.0.0'
gem.add_dependency 'dm-serializer', '~> 1.0.0'
gem.add_dependency 'dm-timestamps', '~> 1.0.0'
gem.add_dependency 'dm-rails', '~> 1.0.0'
gem.add_dependency 'dm-rails', '~> 1.0.3'
gem.add_dependency 'devise', '~> 1.1.0'
gem.add_dependency 'warden', '~> 0.10.7'
gem.add_dependency 'bcrypt-ruby', '~> 2.1.2'
Expand Down

0 comments on commit 41a0def

Please sign in to comment.