Skip to content

Commit

Permalink
Merge branch 'ruby223'
Browse files Browse the repository at this point in the history
  • Loading branch information
koi-chan committed Sep 19, 2015
2 parents a3ddc10 + f593a00 commit 17bd442
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 18 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,19 @@ rvm:
- 2.1.0
- 2.1.2
- 2.1.5
- 2.1.7
- 2.2.0
- 2.2.1
- 2.2.3
notifications:
irc:
use_notice: true
channels:
- 'irc.trpg.net#irc_test'
on_success: always
on_failure: always
template:
- '%{repository_slug} #%{build_number} %{branch} - %{commit} -> %{result}'
- '変更履歴: %{compare_url}'
- 'ステータス: %{build_url}'
email: false
43 changes: 25 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.3)
activesupport (4.2.4)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
ast (2.1.0)
astrolabe (1.3.1)
parser (~> 2.2)
buftok (0.2.0)
cinch (2.2.6)
coderay (1.1.0)
Expand All @@ -26,26 +26,30 @@ GEM
docile (1.1.5)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
equalizer (0.0.10)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
http (0.6.4)
http (0.9.6)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 1.0.1)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.2)
domain_name (~> 0.5)
http-form_data (1.0.1)
http_parser.rb (0.6.0)
i18n (0.7.0)
json (1.8.3)
lumberjack (1.0.9)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.6.1)
minitest (5.7.0)
mime-types (2.6.2)
minitest (5.8.0)
multipart-post (2.0.0)
naught (1.0.0)
naught (1.1.0)
netrc (0.10.3)
parser (2.3.0.pre.2)
parser (2.2.2.6)
ast (>= 1.1, < 3.0)
powerpack (0.1.1)
pry (0.10.1)
Expand All @@ -62,16 +66,16 @@ GEM
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.1)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.1)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rubocop (0.32.1)
rubocop (0.34.1)
astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0)
powerpack (~> 0.1)
Expand All @@ -91,13 +95,13 @@ GEM
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tins (1.5.4)
twitter (5.14.0)
tins (1.6.0)
twitter (5.15.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.9)
equalizer (= 0.0.10)
faraday (~> 0.9.0)
http (~> 0.6.0)
http (>= 0.4, < 0.10)
http_parser.rb (~> 0.6.0)
json (~> 1.8)
memoizable (~> 0.4.0)
Expand Down Expand Up @@ -129,3 +133,6 @@ DEPENDENCIES
twitter (~> 5.11)
webmock (~> 1.20)
yard (~> 0.8)

BUNDLED WITH
1.10.6

0 comments on commit 17bd442

Please sign in to comment.