sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mysql2 again set to 0.2.7 as that's what works with rails 3.0.x

Browse source
This commit is contained in:
Roland Jesse 2012-01-12 22:02:13 +01:00
parent 58b1849cd8
commit b50799e81d
2 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gemfile
View file

@ -9,13 +9,13 @@ gem 'rake', '0.8.7'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
#gem 'mysql2', '0.3.7' gem 'mysql2', '0.2.7'
gem 'sqlite3' #gem 'sqlite3'
# https://github.com/plataformatec/devise # https://github.com/plataformatec/devise
gem 'devise', '1.2.1' gem 'devise', '1.2.1'
# gem 'bcrypt-ruby', '2.1.4' gem 'bcrypt-ruby', '2.1.4'
gem 'bcrypt-ruby' #gem 'bcrypt-ruby'
# https://github.com/ryanb/cancan # https://github.com/ryanb/cancan
gem 'cancan', '1.6.5' gem 'cancan', '1.6.5'

36
Gemfile.lock
View file

@ -48,36 +48,38 @@ GEM
faraday (0.6.1) faraday (0.6.1)
addressable (~> 2.2.4) addressable (~> 2.2.4)
multipart-post (~> 1.1.0) multipart-post (~> 1.1.0)
rack (< 2, >= 1.1.0) rack (>= 1.1.0, < 2)
faraday_middleware (0.6.5) faraday_middleware (0.6.5)
faraday (~> 0.6.0) faraday (~> 0.6.0)
hashie (1.0.0) hashie (1.0.0)
highline (1.6.1) highline (1.6.9)
i18n (0.5.0) i18n (0.5.0)
json (1.6.4)
mail (2.2.19) mail (2.2.19)
activesupport (>= 2.3.6) activesupport (>= 2.3.6)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.16) mime-types (1.17.2)
multi_json (1.0.3) multi_json (1.0.4)
multi_xml (0.2.2) multi_xml (0.2.2)
multipart-post (1.1.2) multipart-post (1.1.4)
mysql2 (0.2.7) mysql2 (0.2.7)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-sftp (2.0.5) net-sftp (2.0.5)
net-ssh (>= 2.0.9) net-ssh (>= 2.0.9)
net-ssh (2.1.4) net-ssh (2.3.0)
net-ssh-gateway (1.0.1) net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
orm_adapter (0.0.4) orm_adapter (0.0.6)
polyglot (0.3.1) polyglot (0.3.3)
rack (1.2.2) rack (1.2.5)
rack-mount (0.6.14) rack-mount (0.6.14)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (0.5.7) rack-test (0.5.7)
rack (>= 1.0) rack (>= 1.0)
railroady (1.0.4)
rails (3.0.9) rails (3.0.9)
actionmailer (= 3.0.9) actionmailer (= 3.0.9)
actionpack (= 3.0.9) actionpack (= 3.0.9)
@ -93,10 +95,12 @@ GEM
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.4) thor (~> 0.14.4)
rake (0.8.7) rake (0.8.7)
rdoc (3.8) rdoc (3.12)
json (~> 1.4)
simple_oauth (0.1.5) simple_oauth (0.1.5)
thor (0.14.6) thor (0.14.6)
treetop (1.4.9) treetop (1.4.10)
polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
twitter (1.6.0) twitter (1.6.0)
faraday (~> 0.6.1) faraday (~> 0.6.1)
@ -105,13 +109,12 @@ GEM
multi_json (~> 1.0.0) multi_json (~> 1.0.0)
multi_xml (~> 0.2.0) multi_xml (~> 0.2.0)
simple_oauth (~> 0.1.5) simple_oauth (~> 0.1.5)
tzinfo (0.3.26) tzinfo (0.3.31)
warden (1.0.3) warden (1.0.6)
rack (>= 1.0.0) rack (>= 1.0)
PLATFORMS PLATFORMS
ruby ruby
x86-mingw32
DEPENDENCIES DEPENDENCIES
bcrypt-ruby (= 2.1.4) bcrypt-ruby (= 2.1.4)
@ -119,6 +122,7 @@ DEPENDENCIES
capistrano (= 2.5.21) capistrano (= 2.5.21)
devise (= 1.2.1) devise (= 1.2.1)
mysql2 (= 0.2.7) mysql2 (= 0.2.7)
railroady
rails (= 3.0.9) rails (= 3.0.9)
rake (= 0.8.7) rake (= 0.8.7)
twitter (= 1.6.0) twitter (= 1.6.0)