Download as
Browse Code »

Commit 133102a7eb828c1c9fd016851aaca3d9f5d99e7e

Authored by Dmitriy Zaporozhets
2 parents 89043d6b e4d47d30
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #866 from NARKOZ/travis-ruby193 

Travis and Ruby 1.9.3
Showing 3 changed files with 6 additions and 7 deletions   Show diff stats
1 env: 1 env:
2 - DB=mysql 2 - DB=mysql
3 - DB=sqlite 3 - DB=sqlite
4 -before_install: sudo apt-get install libicu-dev -y 4 +before_install:
  5 + - sudo apt-get install libicu-dev -y
  6 + - echo "yes" | gem uninstall json ffi
5 branches: 7 branches:
6 only: 8 only:
7 - 'master' 9 - 'master'
8 rvm: 10 rvm:
9 - 1.9.2 11 - 1.9.2
  12 + - 1.9.3
10 before_script: 13 before_script:
11 - "cp config/database.yml.$DB config/database.yml" 14 - "cp config/database.yml.$DB config/database.yml"
12 - "cp config/gitlab.yml.example config/gitlab.yml" 15 - "cp config/gitlab.yml.example config/gitlab.yml"
@@ -65,6 +65,6 @@ end @@ -65,6 +65,6 @@ end
65 group :test do 65 group :test do
66 gem "turn", :require => false 66 gem "turn", :require => false
67 gem "simplecov", :require => false 67 gem "simplecov", :require => false
68 - gem "shoulda", "3.0.1" 68 + gem "shoulda-matchers"
69 gem 'email_spec' 69 gem 'email_spec'
70 end 70 end
@@ -269,10 +269,6 @@ GEM @@ -269,10 +269,6 @@ GEM
269 libwebsocket (~> 0.1.3) 269 libwebsocket (~> 0.1.3)
270 multi_json (~> 1.0) 270 multi_json (~> 1.0)
271 rubyzip 271 rubyzip
272 - shoulda (3.0.1)  
273 - shoulda-context (~> 1.0.0)  
274 - shoulda-matchers (~> 1.0.0)  
275 - shoulda-context (1.0.0)  
276 shoulda-matchers (1.0.0) 272 shoulda-matchers (1.0.0)
277 simplecov (0.6.4) 273 simplecov (0.6.4)
278 multi_json (~> 1.0) 274 multi_json (~> 1.0)
@@ -368,7 +364,7 @@ DEPENDENCIES @@ -368,7 +364,7 @@ DEPENDENCIES
368 rspec-rails 364 rspec-rails
369 sass-rails (= 3.2.3) 365 sass-rails (= 3.2.3)
370 seed-fu 366 seed-fu
371 - shoulda (= 3.0.1) 367 + shoulda-matchers
372 simplecov 368 simplecov
373 six 369 six
374 sqlite3 370 sqlite3