deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #866 from NARKOZ/travis-ruby193

Browse source 
Travis and Ruby 1.9.3
This commit is contained in:
Dmitriy Zaporozhets 2012-05-29 03:25:47 -07:00
commit 133102a7eb
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -1,12 +1,15 @@
env: env:
- DB=mysql - DB=mysql
- DB=sqlite - DB=sqlite
before_install: sudo apt-get install libicu-dev -y before_install:
- sudo apt-get install libicu-dev -y
- echo "yes" | gem uninstall json ffi
branches: branches:
only: only:
- 'master' - 'master'
rvm: rvm:
- 1.9.2 - 1.9.2
- 1.9.3
before_script: before_script:
- "cp config/database.yml.$DB config/database.yml" - "cp config/database.yml.$DB config/database.yml"
- "cp config/gitlab.yml.example config/gitlab.yml" - "cp config/gitlab.yml.example config/gitlab.yml"

2
Gemfile
View file

@ -65,6 +65,6 @@ end
group :test do group :test do
gem "turn", :require => false gem "turn", :require => false
gem "simplecov", :require => false gem "simplecov", :require => false
gem "shoulda", "3.0.1" gem "shoulda-matchers"
gem 'email_spec' gem 'email_spec'
end end

6
Gemfile.lock
View file

@ -269,10 +269,6 @@ GEM
libwebsocket (~> 0.1.3) libwebsocket (~> 0.1.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
shoulda (3.0.1)
shoulda-context (~> 1.0.0)
shoulda-matchers (~> 1.0.0)
shoulda-context (1.0.0)
shoulda-matchers (1.0.0) shoulda-matchers (1.0.0)
simplecov (0.6.4) simplecov (0.6.4)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -368,7 +364,7 @@ DEPENDENCIES
rspec-rails rspec-rails
sass-rails (= 3.2.3) sass-rails (= 3.2.3)
seed-fu seed-fu
shoulda (= 3.0.1) shoulda-matchers
simplecov simplecov
six six
sqlite3 sqlite3