Permalink
Browse files

Update Gemfile for dummy app to Devise 1.3.4

Remove and gitignore dummy app's Gemfile.lock, as this doesn't need to be committed, but caused me lots of upgrade issues with Devise.
  • Loading branch information...
1 parent 7f9f366 commit 887eb68e828264f7bd33ef40f3492e2edf30eab1 @wolframarnold wolframarnold committed May 3, 2011
Showing with 2 additions and 111 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 spec/dummy_app/Gemfile
  3. +0 −110 spec/dummy_app/Gemfile.lock
View
1 .gitignore
@@ -22,4 +22,5 @@ spec/dummy_app/db/*.sqlite3
spec/dummy_app/db/*.sqlite3-journal
spec/dummy_app/db/schema.rb
spec/dummy_app/log/*.log
+spec/dummy_app/Gemfile.lock
tmp/**/*
View
2 spec/dummy_app/Gemfile
@@ -1,7 +1,7 @@
source 'http://rubygems.org'
gem 'rails', '~> 3.0.7'
-gem 'devise', '~> 1.1'
+gem 'devise', '~> 1.3.4'
gem 'paperclip', '~> 2.3'
gem 'rails_admin', :path => '../../'
gem 'mlb'
View
110 spec/dummy_app/Gemfile.lock
@@ -1,110 +0,0 @@
-PATH
- remote: ../../
- specs:
- rails_admin (0.0.1)
- builder (~> 2.1.0)
- rails (~> 3.0.6)
-
-GEM
- remote: http://rubygems.org/
- specs:
- abstract (1.0.0)
- actionmailer (3.0.7)
- actionpack (= 3.0.7)
- mail (~> 2.2.15)
- actionpack (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.7)
- activesupport (= 3.0.7)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
- arel (~> 2.0.2)
- tzinfo (~> 0.3.23)
- activeresource (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
- activesupport (3.0.7)
- addressable (2.2.5)
- arel (2.0.9)
- bcrypt-ruby (2.1.4)
- bcrypt-ruby (2.1.4-java)
- builder (2.1.2)
- devise (1.3.4)
- bcrypt-ruby (~> 2.1.2)
- orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- faraday (0.6.1)
- addressable (~> 2.2.4)
- multipart-post (~> 1.1.0)
- rack (< 2, >= 1.1.0)
- faraday_middleware (0.6.3)
- faraday (~> 0.6.0)
- i18n (0.5.0)
- mail (2.2.19)
- activesupport (>= 2.3.6)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.16)
- mlb (0.5.4)
- faraday (~> 0.6.0)
- faraday_middleware (~> 0.6.0)
- multi_json (~> 0.0.5)
- multi_json (0.0.5)
- multipart-post (1.1.0)
- orm_adapter (0.0.4)
- paperclip (2.3.11)
- activerecord (>= 2.3.0)
- activesupport (>= 2.3.2)
- polyglot (0.3.1)
- rack (1.2.2)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-test (0.5.7)
- rack (>= 1.0)
- rails (3.0.7)
- actionmailer (= 3.0.7)
- actionpack (= 3.0.7)
- activerecord (= 3.0.7)
- activeresource (= 3.0.7)
- activesupport (= 3.0.7)
- bundler (~> 1.0)
- railties (= 3.0.7)
- railties (3.0.7)
- actionpack (= 3.0.7)
- activesupport (= 3.0.7)
- rake (>= 0.8.7)
- thor (~> 0.14.4)
- rake (0.8.7)
- sqlite3 (1.3.3)
- thor (0.14.6)
- treetop (1.4.9)
- polyglot (>= 0.3.1)
- tzinfo (0.3.27)
- warden (1.0.3)
- rack (>= 1.0.0)
-
-PLATFORMS
- java
- ruby
-
-DEPENDENCIES
- devise (~> 1.1)
- mlb
- paperclip (~> 2.3)
- rails (~> 3.0.7)
- rails_admin!
- sqlite3 (~> 1.3)

0 comments on commit 887eb68

Please sign in to comment.