Skip to content
This repository was archived by the owner on Jul 22, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '4.2.8'
gem 'rails', '4.2.9'

gem 'pg'
gem 'yajl-ruby'
Expand Down
129 changes: 65 additions & 64 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
actionmailer (4.2.9)
actionpack (= 4.2.9)
actionview (= 4.2.9)
activejob (= 4.2.9)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
actionpack (4.2.9)
actionview (= 4.2.9)
activesupport (= 4.2.9)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.8)
activesupport (= 4.2.8)
actionview (4.2.9)
activesupport (= 4.2.9)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
activejob (4.2.9)
activesupport (= 4.2.9)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
activemodel (4.2.9)
activesupport (= 4.2.9)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
activerecord (4.2.9)
activemodel (= 4.2.9)
activesupport (= 4.2.9)
arel (~> 6.0)
activesupport (4.2.8)
activesupport (4.2.9)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (6.0.4)
ast (2.3.0)
bcrypt (3.1.11)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
brakeman (3.6.2)
brakeman (3.7.2)
builder (3.2.3)
byebug (9.0.6)
capybara (2.14.0)
byebug (9.1.0)
capybara (2.15.1)
addressable
mime-types (>= 1.16)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
Expand All @@ -72,9 +72,9 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.3)
erubis (2.7.0)
eventmachine (1.2.3)
eventmachine (1.2.5)
execjs (2.7.0)
faker (1.7.3)
faker (1.8.4)
i18n (~> 0.5)
figaro (1.1.1)
thor (~> 0.14)
Expand All @@ -87,14 +87,14 @@ GEM
gravtastic (3.2.6)
hashr (0.0.22)
hike (1.2.3)
hipchat (1.5.4)
hipchat (1.6.0)
httparty
mimemagic
hirb (0.7.3)
hiredis (0.5.2)
httparty (0.15.5)
httparty (0.15.6)
multi_xml (>= 0.5.2)
i18n (0.8.4)
i18n (0.8.6)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
Expand All @@ -109,27 +109,28 @@ GEM
loofah (2.0.3)
nokogiri (>= 1.5.9)
machinist (2.0)
mail (2.6.5)
mail (2.6.6)
mime-types (>= 1.16, < 4)
mime-types (2.99.3)
mimemagic (0.3.2)
mini_portile2 (2.2.0)
minitest (5.10.2)
multi_json (1.12.1)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.10.3)
multi_json (1.12.2)
multi_xml (0.6.0)
newrelic-redis (2.0.2)
newrelic_rpm (~> 3.11)
redis (< 4.0)
newrelic_rpm (3.18.1.330)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
parallel (1.11.2)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
pg (0.20.0)
pg (0.21.0)
powerpack (0.1.1)
public_suffix (2.0.5)
public_suffix (3.0.0)
rack (1.6.8)
rack-mini-profiler (0.10.5)
rack (>= 1.2.0)
Expand All @@ -138,16 +139,16 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.4.2)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
rails (4.2.9)
actionmailer (= 4.2.9)
actionpack (= 4.2.9)
actionview (= 4.2.9)
activejob (= 4.2.9)
activemodel (= 4.2.9)
activerecord (= 4.2.9)
activesupport (= 4.2.9)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.8)
railties (= 4.2.9)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -157,15 +158,15 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
railties (4.2.9)
actionpack (= 4.2.9)
activesupport (= 4.2.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake
raindrops (0.18.0)
rake (12.0.0)
raindrops (0.19.0)
rake (12.1.0)
ranked-model (0.4.0)
activerecord (>= 3.1.12)
redis (3.3.3)
Expand All @@ -182,7 +183,7 @@ GEM
rspec-mocks (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-rails (3.6.0)
rspec-rails (3.6.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
Expand All @@ -191,22 +192,22 @@ GEM
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
rubocop (0.49.1)
rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-prof (0.16.2)
ruby-progressbar (1.8.1)
ruby-progressbar (1.8.3)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
shoulda-matchers (3.1.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
sidekiq (4.2.10)
concurrent-ruby (~> 1.0)
Expand All @@ -219,12 +220,12 @@ GEM
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-console (0.4.1)
simplecov-console (0.4.2)
ansi
hirb
simplecov
simplecov-html (0.7.1)
slack-notifier (2.2.1)
slack-notifier (2.3.1)
spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
Expand All @@ -241,14 +242,14 @@ GEM
stackprof (0.2.10)
term-ansicolor (1.2.2)
tins (~> 0.8)
thin (1.7.0)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.18.1)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.8.1)
timecop (0.9.1)
tins (0.13.2)
tire (0.6.2)
activemodel (>= 3.0)
Expand All @@ -265,7 +266,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.2.1)
unicode-display_width (1.3.0)
unicorn (5.3.0)
kgio (~> 2.6)
raindrops (~> 0.7)
Expand All @@ -278,7 +279,7 @@ GEM
sprockets-rails (>= 2.0, < 4.0)
whenever (0.9.7)
chronic (>= 0.6.3)
will_paginate (3.1.5)
will_paginate (3.1.6)
xpath (2.1.0)
nokogiri (~> 1.3)
yajl-ruby (1.3.0)
Expand Down Expand Up @@ -308,7 +309,7 @@ DEPENDENCIES
pg
rack-mini-profiler
rack-timeout
rails (= 4.2.8)
rails (= 4.2.9)
ranked-model
redis
rspec-rails (~> 3.0)
Expand Down Expand Up @@ -336,4 +337,4 @@ DEPENDENCIES
yajl-ruby

BUNDLED WITH
1.14.6
1.15.4