diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-10 10:24:17 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-10 10:24:17 +0000 |
| commit | d1261d88f191b91850815b66f7cdb7914968fc5e (patch) | |
| tree | 92ccc14fd8006ccb711d41ba9276ffa7d08b333d | |
| parent | e745b9e363747bd927b08248787728389cf1fb15 (diff) | |
| parent | b50bfcc61965b71a66df21964d7d98b50c5f8d19 (diff) | |
| download | gitlab-ce-d1261d88f191b91850815b66f7cdb7914968fc5e.tar.gz | |
Merge branch 'rs-update-coveralls' into 'master'
Bump coveralls version, remove explicit rest-client dependency
coveralls got updated, so we don't need the rest-client entry in the Gemfile anymore.
See merge request !951
| -rw-r--r-- | Gemfile | 12 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 5 insertions, 12 deletions
@@ -231,19 +231,13 @@ group :development, :test do gem 'fuubar', '~> 2.0.0' gem 'pry-rails' - gem 'coveralls', require: false + gem 'coveralls', '~> 0.8.2', require: false gem 'database_cleaner', '~> 1.4.0' gem 'factory_girl_rails' - gem 'rspec-rails', '~> 3.3.0' - gem 'rubocop', '0.28.0', require: false + gem 'rspec-rails', '~> 3.3.0' + gem 'rubocop', '0.28.0', require: false gem 'spinach-rails' - # rest-client is a coveralls dependency and not used directly in GitLab, but - # we specify a version here to pick up some security fixes. - # See https://github.com/rest-client/rest-client/issues/369 - # and http://www.osvdb.org/show/osvdb/117461 - gem 'rest-client', '~> 1.8.0' - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 8114063cee0..6e571072a4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -703,7 +703,7 @@ GEM underscore-rails (1.4.4) unf (0.1.4) unf_ext - unf_ext (0.0.6) + unf_ext (0.0.7.1) unicorn (4.6.3) kgio (~> 2.6) rack @@ -759,7 +759,7 @@ DEPENDENCIES charlock_holmes coffee-rails colored - coveralls + coveralls (~> 0.8.2) creole (~> 0.3.6) d3_rails (~> 3.5.5) database_cleaner (~> 1.4.0) @@ -833,7 +833,6 @@ DEPENDENCIES redis-rails request_store rerun (~> 0.10.0) - rest-client (~> 1.8.0) rqrcode-rails3 rspec-rails (~> 3.3.0) rubocop (= 0.28.0) |