Skip to content
Open
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
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem 'omniauth-github'
gem 'omniauth-twitter'
gem 'octokit'
gem 'rabl'
gem 'kaminari'
gem 'kaminari', '>= 1.2.1'
gem 'twitter'
gem 'bootstrap-sass'
gem 'jquery-datetimepicker-rails'
Expand All @@ -26,7 +26,7 @@ gem 'geocoder'
gem 'lodash-rails'
gem 'typhoeus'
gem 'sassc-rails'
gem 'puma'
gem 'puma', '>= 3.12.6'
gem 'rack-attack'

group :development do
Expand Down
58 changes: 31 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ GEM
brakeman (3.5.0)
buftok (0.2.0)
bugsnag (5.2.0)
builder (3.2.3)
builder (3.2.4)
callsite (0.0.11)
capybara (2.12.1)
addressable
Expand All @@ -76,9 +76,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.6)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
dalli (2.7.6)
database_cleaner (1.5.3)
debug_inspector (0.0.2)
Expand Down Expand Up @@ -131,7 +132,8 @@ GEM
domain_name (~> 0.5)
http-form_data (1.0.1)
http_parser.rb (0.6.0)
i18n (0.8.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.12)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
Expand All @@ -149,23 +151,24 @@ GEM
thor (>= 0.14, < 2.0)
json (2.0.3)
jwt (1.5.6)
kaminari (1.0.1)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.0.1)
kaminari-activerecord (= 1.0.1)
kaminari-core (= 1.0.1)
kaminari-actionview (1.0.1)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.0.1)
kaminari-activerecord (1.0.1)
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
launchy (2.4.3)
addressable (~> 2.3)
lodash-rails (4.17.4)
railties (>= 3.1)
loofah (2.0.3)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
Expand All @@ -179,16 +182,16 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
mini_portile2 (2.4.0)
minitest (5.14.1)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
naught (1.1.0)
newrelic_rpm (3.18.1.330)
nio4r (2.0.0)
nokogiri (1.7.0.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
oauth (0.5.1)
oauth2 (1.3.1)
faraday (>= 0.8, < 0.12)
Expand Down Expand Up @@ -227,7 +230,8 @@ GEM
websocket-driver (>= 0.2.0)
powerpack (0.1.1)
public_suffix (2.0.5)
puma (3.7.1)
puma (4.3.5)
nio4r (~> 2.0)
rabl (0.13.1)
activesupport (>= 2.3.14)
rack (2.0.1)
Expand Down Expand Up @@ -259,11 +263,11 @@ GEM
actionpack (~> 5.x)
actionview (~> 5.x)
activesupport (~> 5.x)
rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
Expand Down Expand Up @@ -373,7 +377,7 @@ GEM
simple_oauth (~> 0.3.1)
typhoeus (1.1.2)
ethon (>= 0.9.0)
tzinfo (1.2.2)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (3.1.4)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -418,7 +422,7 @@ DEPENDENCIES
i18n-tasks
jquery-datetimepicker-rails
jquery-rails
kaminari
kaminari (>= 1.2.1)
launchy
lodash-rails
meta_request
Expand All @@ -430,7 +434,7 @@ DEPENDENCIES
omniauth-twitter
pg
poltergeist
puma
puma (>= 3.12.6)
rabl
rack-attack
rack-canonical-host
Expand Down Expand Up @@ -461,4 +465,4 @@ RUBY VERSION
ruby 2.4.0p0

BUNDLED WITH
1.14.6
1.17.3