Skip to content

Commit

Permalink
Merge branch 'master' into ruby2.5_haxx
Browse files Browse the repository at this point in the history
  • Loading branch information
ikapelyukhin committed Oct 26, 2017
2 parents bacc3ef + 9e8a63f commit bef163b
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Gemfile
Expand Up @@ -79,3 +79,5 @@ gem 'gettext_i18n_rails'

gem 'config', '~> 1.0'
gem 'terminal-table', '~> 1.8'

gem 'coveralls', require: false
26 changes: 26 additions & 0 deletions Gemfile.lock
Expand Up @@ -49,11 +49,19 @@ GEM
config (1.4.0)
activesupport (>= 3.0)
deep_merge (~> 1.1.1)
coveralls (0.7.1)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
term-ansicolor
thor
crack (0.4.3)
safe_yaml (~> 1.0.0)
deep_merge (1.1.1)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubi (1.6.1)
ethon (0.10.1)
ffi (>= 1.3.0)
Expand All @@ -73,6 +81,8 @@ GEM
gettext_test_log (0.2.1)
hashdiff (0.3.2)
hpricot (0.8.6)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.8.6)
json (2.0.3)
jsonapi-renderer (0.1.2)
Expand All @@ -85,10 +95,15 @@ GEM
nokogiri (>= 1.5.9)
memory_profiler (0.9.8)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.2.0)
minitest (5.10.3)
multi_json (1.12.2)
mustache (0.99.5)
mysql2 (0.4.9)
netrc (0.11.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
parallel (1.12.0)
Expand Down Expand Up @@ -121,6 +136,10 @@ GEM
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
ronn (0.7.3)
hpricot (>= 0.8.2)
mustache (>= 0.7.0)
Expand Down Expand Up @@ -175,15 +194,21 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
term-ansicolor (1.6.0)
tins (~> 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
text (1.3.1)
thor (0.20.0)
thread_safe (0.3.6)
tins (1.15.0)
typhoeus (1.1.2)
ethon (>= 0.9.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unicode-display_width (1.3.0)
versionist (1.5.0)
activesupport (>= 3)
Expand All @@ -207,6 +232,7 @@ DEPENDENCIES
activesupport (~> 5.1.3)
byebug
config (~> 1.0)
coveralls
factory_girl_rails
fast_gettext
ffaker
Expand Down
5 changes: 4 additions & 1 deletion README.md
@@ -1,5 +1,8 @@
# Repository Mirroring Tool
![Kartoha](https://travis-ci.org/SUSE/rmt.svg?branch=master)
[![Build Status](https://travis-ci.org/SUSE/rmt.svg?branch=master)](https://travis-ci.org/SUSE/rmt)
[![Dependency Status](https://gemnasium.com/SUSE/rmt.svg)](https://gemnasium.com/SUSE/rmt)
[![Code Climate](https://codeclimate.com/github/SUSE/rmt.png)](https://codeclimate.com/github/SUSE/rmt)
[![Coverage Status](https://coveralls.io/repos/SUSE/rmt/badge.svg?branch=master&service=github)](https://coveralls.io/github/SUSE/rmt?branch=master)

This tool allows you to mirror RPM repositories in your own private network.
Organization (mirroring) credentials are required to mirror SUSE repositories.
Expand Down
6 changes: 6 additions & 0 deletions spec/spec_helper.rb
Expand Up @@ -5,6 +5,12 @@
track_files('app/**/*.rb')
track_files('lib/**/*.rb')
end

if ENV['TRAVIS']
require 'coveralls'
Coveralls.wear!
end

# This file was generated by the `rails generate rspec:install` command. Conventionally, all
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
# The generated `.rspec` file contains `--require spec_helper` which will cause
Expand Down

0 comments on commit bef163b

Please sign in to comment.