Skip to content

Commit

Permalink
Merge branch 'master' into scr-let-irc-adapter-have-mail-sender
Browse files Browse the repository at this point in the history
  • Loading branch information
ochaochaocha3 committed Jan 8, 2018
2 parents 500bc3b + 1e76f36 commit 5d9def8
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 54 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ language: ruby
cache: bundler
bundler_args: --deployment
rvm:
- 2.2.8
- 2.2.9
- 2.3.1
- 2.3.5
- 2.4.2
- 2.3.6
- 2.4.3
- 2.5.0
before_install:
# https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443
- gem update --system
notifications:
irc:
use_notice: true
Expand Down
99 changes: 48 additions & 51 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GEM
ast (2.3.0)
buftok (0.2.0)
charlock_holmes (0.7.5)
cinch (2.3.3)
cinch (2.3.4)
coderay (1.1.2)
concurrent-ruby (1.0.5)
coveralls (0.8.21)
Expand All @@ -22,28 +22,27 @@ GEM
tins (~> 1.6)
crack (0.4.3)
safe_yaml (~> 1.0.0)
d1lcs (0.5.3)
d1lcs (0.5.4)
daemons (1.2.6)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
eventmachine (1.0.9.1)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
guess_html_encoding (0.0.11)
hashdiff (0.3.6)
http (2.2.2)
hashdiff (0.3.7)
http (3.0.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 1.0.1)
http-form_data (>= 2.0.0.pre.pre2, < 3)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (1.0.3)
http-form_data (2.0.0)
http_parser.rb (0.6.0)
i18n (0.8.6)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
json (2.1.0)
lumberjack (1.0.12)
mail (2.6.6)
Expand All @@ -58,52 +57,50 @@ GEM
thin (~> 1.5.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.2.0)
minitest (5.10.3)
mini_portile2 (2.3.0)
minitest (5.11.1)
multipart-post (2.0.0)
naught (1.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
powerpack (0.1.1)
pry (0.10.4)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (3.0.0)
method_source (~> 0.9.0)
public_suffix (3.0.1)
rack (1.6.8)
rack-protection (1.5.3)
rack
rainbow (2.2.2)
rake
rake (12.1.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
rainbow (3.0.0)
rake (12.3.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-mocks (3.6.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
rubocop (0.50.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rubocop (0.52.1)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 3.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.3)
ruby-progressbar (1.9.0)
safe_yaml (1.0.4)
simple_oauth (0.3.1)
simplecov (0.14.1)
Expand All @@ -118,7 +115,6 @@ GEM
skinny (0.2.4)
eventmachine (~> 1.0.0)
thin (>= 1.5, < 1.7)
slop (3.6.0)
sqlite3 (1.3.13)
sysexits (1.2.0)
term-ansicolor (1.6.0)
Expand All @@ -130,18 +126,19 @@ GEM
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.8)
tins (1.15.0)
twitter (6.1.0)
addressable (~> 2.5)
tins (1.16.3)
twitter (6.2.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (= 0.0.11)
faraday (~> 0.11.0)
http (~> 2.1)
equalizer (~> 0.0.11)
http (~> 3.0)
http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
memoizable (~> 0.4.2)
naught (~> 1.1)
simple_oauth (~> 0.3.1)
tzinfo (1.2.3)
memoizable (~> 0.4.0)
multipart-post (~> 2.0)
naught (~> 1.0)
simple_oauth (~> 0.3.0)
tzinfo (1.2.4)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
Expand All @@ -151,7 +148,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
yard (0.9.9)
yard (0.9.12)

PLATFORMS
ruby
Expand Down

0 comments on commit 5d9def8

Please sign in to comment.