Skip to content

Commit

Permalink
Going for rails 3.1 rc5 and let's give us a try using ruby 1.8.7 on T…
Browse files Browse the repository at this point in the history
…ravis.
  • Loading branch information
daronco committed Aug 5, 2011
1 parent d511751 commit 4a7b8f4
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 42 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -4,4 +4,5 @@ before_script:
- "cp config/setup_conf.yml.example config/setup_conf.yml" - "cp config/setup_conf.yml.example config/setup_conf.yml"
script: bundle exec rake travis script: bundle exec rake travis
rvm: rvm:
- 1.8.7
- 1.9.2 - 1.9.2
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'


gem "rails", "~> 3.1.0.rc1" gem "rails", "3.1.0.rc5"
#gem "mysql2", "0.3.2" #gem "mysql2", "0.3.2"


# general purpose # general purpose
Expand Down
82 changes: 41 additions & 41 deletions Gemfile.lock
Expand Up @@ -17,37 +17,36 @@ GIT
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.1.0.rc4) actionmailer (3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
mail (~> 2.3.0) mail (~> 2.3.0)
actionpack (3.1.0.rc4) actionpack (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
i18n (~> 0.6) i18n (~> 0.6)
rack (~> 1.3.0) rack (~> 1.3.1)
rack-cache (~> 1.0.1) rack-cache (~> 1.0.2)
rack-mount (~> 0.8.1) rack-mount (~> 0.8.1)
rack-test (~> 0.6.0) rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.10) sprockets (~> 2.0.0.beta.12)
tzinfo (~> 0.3.27) activemodel (3.1.0.rc5)
activemodel (3.1.0.rc4) activesupport (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4)
bcrypt-ruby (~> 2.1.4) bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0) builder (~> 3.0.0)
i18n (~> 0.6) i18n (~> 0.6)
activerecord (3.1.0.rc4) activerecord (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
arel (~> 2.1.1) arel (~> 2.1.4)
tzinfo (~> 0.3.27) tzinfo (~> 0.3.29)
activeresource (3.1.0.rc4) activeresource (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
activesupport (3.1.0.rc4) activesupport (3.1.0.rc5)
multi_json (~> 1.0) multi_json (~> 1.0)
arel (2.1.1) arel (2.1.4)
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4)
bigbluebutton-api-ruby (0.0.10) bigbluebutton-api-ruby (0.0.10)
nokogiri (~> 1.4.0) nokogiri (~> 1.4.0)
Expand Down Expand Up @@ -105,7 +104,7 @@ GEM
gherkin (2.4.5) gherkin (2.4.5)
json (>= 1.4.6) json (>= 1.4.6)
haml (3.1.2) haml (3.1.2)
hike (1.1.0) hike (1.2.0)
i18n (0.6.0) i18n (0.6.0)
jquery-rails (1.0.11) jquery-rails (1.0.11)
railties (~> 3.0) railties (~> 3.0)
Expand All @@ -121,24 +120,24 @@ GEM
multi_json (1.0.3) multi_json (1.0.3)
nokogiri (1.4.5) nokogiri (1.4.5)
orm_adapter (0.0.5) orm_adapter (0.0.5)
polyglot (0.3.1) polyglot (0.3.2)
rack (1.3.0) rack (1.3.2)
rack-cache (1.0.2) rack-cache (1.0.2)
rack (>= 0.4) rack (>= 0.4)
rack-mount (0.8.1) rack-mount (0.8.1)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-ssl (1.3.2) rack-ssl (1.3.2)
rack rack
rack-test (0.6.0) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.1.0.rc4) rails (3.1.0.rc5)
actionmailer (= 3.1.0.rc4) actionmailer (= 3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
activerecord (= 3.1.0.rc4) activerecord (= 3.1.0.rc5)
activeresource (= 3.1.0.rc4) activeresource (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.0.rc4) railties (= 3.1.0.rc5)
rails_best_practices (0.10.1) rails_best_practices (0.10.1)
activesupport activesupport
colored colored
Expand All @@ -147,15 +146,15 @@ GEM
i18n i18n
ruby-progressbar ruby-progressbar
ruby_parser ruby_parser
railties (3.1.0.rc4) railties (3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.6) thor (~> 0.14.6)
rake (0.9.2) rake (0.9.2)
rdoc (3.6.1) rdoc (3.9.1)
rspec (2.6.0) rspec (2.6.0)
rspec-core (~> 2.6.0) rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0) rspec-expectations (~> 2.6.0)
Expand Down Expand Up @@ -185,8 +184,8 @@ GEM
simplecov (0.4.2) simplecov (0.4.2)
simplecov-html (~> 0.4.4) simplecov-html (~> 0.4.4)
simplecov-html (0.4.5) simplecov-html (0.4.5)
sprockets (2.0.0.beta.10) sprockets (2.0.0.beta.13)
hike (~> 1.0) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.3) sqlite3 (1.3.3)
Expand All @@ -197,9 +196,10 @@ GEM
libv8 (~> 3.3.10) libv8 (~> 3.3.10)
thor (0.14.6) thor (0.14.6)
tilt (1.3.2) tilt (1.3.2)
treetop (1.4.9) treetop (1.4.10)
polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.28) tzinfo (0.3.29)
uglifier (0.5.4) uglifier (0.5.4)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
Expand All @@ -225,7 +225,7 @@ DEPENDENCIES
fuubar fuubar
jquery-rails jquery-rails
json json
rails (~> 3.1.0.rc1) rails (= 3.1.0.rc5)
rails_best_practices rails_best_practices
rspec-instafail rspec-instafail
rspec-rails (~> 2.6) rspec-rails (~> 2.6)
Expand Down

0 comments on commit 4a7b8f4

Please sign in to comment.