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
.travis.yml
  Diff comments   View file @133102a
1 1 env:
2 2 - DB=mysql
3 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 7 branches:
6 8 only:
7 9 - 'master'
8 10 rvm:
9 11 - 1.9.2
  12 + - 1.9.3
10 13 before_script:
11 14 - "cp config/database.yml.$DB config/database.yml"
12 15 - "cp config/gitlab.yml.example config/gitlab.yml"
... ...
Gemfile
  Diff comments   View file @133102a
... ... @@ -65,6 +65,6 @@ end
65 65 group :test do
66 66 gem "turn", :require => false
67 67 gem "simplecov", :require => false
68   - gem "shoulda", "3.0.1"
  68 + gem "shoulda-matchers"
69 69 gem 'email_spec'
70 70 end
... ...
Gemfile.lock
  Diff comments   View file @133102a
... ... @@ -269,10 +269,6 @@ GEM
269 269 libwebsocket (~> 0.1.3)
270 270 multi_json (~> 1.0)
271 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 272 shoulda-matchers (1.0.0)
277 273 simplecov (0.6.4)
278 274 multi_json (~> 1.0)
... ... @@ -368,7 +364,7 @@ DEPENDENCIES
368 364 rspec-rails
369 365 sass-rails (= 3.2.3)
370 366 seed-fu
371   - shoulda (= 3.0.1)
  367 + shoulda-matchers
372 368 simplecov
373 369 six
374 370 sqlite3
... ...