Skip to content

Commit

Permalink
Merge d1003d8 into ebfded8
Browse files Browse the repository at this point in the history
  • Loading branch information
@hlascelles
hlascelles committed Oct 11, 2018
2 parents ebfded8 + d1003d8 commit 5a752e0
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 112 deletions.
84 changes: 42 additions & 42 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.0)
activesupport (= 5.2.0)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activesupport (5.2.0)
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -45,16 +45,16 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
backports (3.11.3)
backports (3.11.4)
builder (3.2.3)
byebug (9.0.6)
byebug (10.0.2)
codeclimate-engine-rb (0.4.1)
virtus (~> 1.0)
coderay (1.1.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colorize (0.8.1)
combustion (0.9.1)
combustion (1.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
thor (>= 0.14.6)
Expand All @@ -73,16 +73,16 @@ GEM
docile (1.3.1)
equalizer (0.0.11)
erubi (1.7.1)
et-orbi (1.1.4)
et-orbi (1.1.6)
tzinfo
fasterer (0.4.1)
colorize (~> 0.7)
ruby_parser (~> 3.11.0)
fugit (1.1.4)
et-orbi (~> 1.1, >= 1.1.3)
fugit (1.1.6)
et-orbi (~> 1.1, >= 1.1.6)
raabro (~> 1.1)
hashie (3.5.7)
i18n (1.0.1)
hashie (3.6.0)
i18n (1.1.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
json (2.1.0)
Expand All @@ -92,62 +92,62 @@ GEM
method_source (0.9.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
nokogiri (1.8.3)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
parallel (1.12.1)
parser (2.5.1.0)
parser (2.5.1.2)
ast (~> 2.4.0)
pg (0.21.0)
powerpack (0.1.2)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.4.3)
byebug (>= 9.0, < 9.1)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
que (0.14.3)
raabro (1.1.6)
rack (2.0.5)
rack-test (1.0.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.0)
actionpack (= 5.2.0)
activesupport (= 5.2.0)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.1)
reek (4.8.1)
reek (4.8.2)
codeclimate-engine-rb (~> 0.4.0)
parser (>= 2.5.0.0, < 2.6)
rainbow (>= 2.0, < 4.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)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.54.0)
parallel (~> 1.10)
parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
ruby-progressbar (1.10.0)
ruby_parser (3.11.0)
sexp_processor (~> 4.9)
sexp_processor (4.11.0)
Expand Down Expand Up @@ -188,7 +188,7 @@ DEPENDENCIES
pry-byebug
que-scheduler!
rake
reek
reek (~> 4.8)
rspec
rubocop (~> 0.54.0)
sqlite3 (>= 1.3)
Expand Down
54 changes: 28 additions & 26 deletions gemfiles/activesupport_4.gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
que-scheduler (3.2.1)
que-scheduler (3.2.2)
activesupport (>= 4.0)
backports (~> 3.10)
fugit (~> 1.1)
Expand Down Expand Up @@ -46,16 +46,16 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
backports (3.11.3)
backports (3.11.4)
builder (3.2.3)
byebug (9.0.6)
byebug (10.0.2)
codeclimate-engine-rb (0.4.1)
virtus (~> 1.0)
coderay (1.1.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colorize (0.8.1)
combustion (0.9.1)
combustion (1.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
thor (>= 0.14.6)
Expand All @@ -74,37 +74,38 @@ GEM
docile (1.3.1)
equalizer (0.0.11)
erubis (2.7.0)
et-orbi (1.1.2)
et-orbi (1.1.6)
tzinfo
fasterer (0.4.1)
colorize (~> 0.7)
ruby_parser (~> 3.11.0)
fugit (1.1.3)
et-orbi (~> 1.1, >= 1.1.1)
fugit (1.1.6)
et-orbi (~> 1.1, >= 1.1.6)
raabro (~> 1.1)
hashie (3.5.7)
hashie (3.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
json (2.1.0)
kwalify (0.7.2)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (0.9.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
nokogiri (1.8.2)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
parallel (1.12.1)
parser (2.5.1.0)
parser (2.5.1.2)
ast (~> 2.4.0)
pg (0.21.0)
powerpack (0.1.2)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.4.3)
byebug (>= 9.0, < 9.1)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
que (0.14.3)
raabro (1.1.6)
Expand All @@ -126,31 +127,32 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (12.3.1)
reek (4.8.1)
reek (5.1.0)
codeclimate-engine-rb (~> 0.4.0)
parser (>= 2.5.0.0, < 2.6)
kwalify (~> 0.7.0)
parser (>= 2.5.0.0, < 2.6, != 2.5.1.1)
rainbow (>= 2.0, < 4.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)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.54.0)
parallel (~> 1.10)
parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
ruby-progressbar (1.10.0)
ruby_parser (3.11.0)
sexp_processor (~> 4.9)
sexp_processor (4.11.0)
Expand Down
Loading

0 comments on commit 5a752e0

Please sign in to comment.