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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ gem 'invisible_captcha', '~> 0.10.0'
gem 'jquery-fileupload-rails'
gem 'jquery-rails', '~> 4.3.3'
gem 'jquery-ui-rails', '~> 6.0.1'
gem 'kaminari', '~> 1.1.1'
gem 'kaminari', '~> 1.2.1'
gem 'newrelic_rpm', '~> 4.1.0.333'
gem 'omniauth', '~> 1.8.1'
gem 'omniauth-facebook', '~> 4.0.0'
Expand Down
42 changes: 21 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ GEM
execjs (~> 2.0)
bcrypt (3.1.11)
browser (2.5.3)
builder (3.2.3)
builder (3.2.4)
bullet (5.7.1)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
Expand Down Expand Up @@ -113,7 +113,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.6)
cookies_eu (1.6.3)
js_cookie_rails
coveralls (0.8.22)
Expand All @@ -122,7 +122,7 @@ GEM
term-ansicolor (~> 1.3)
thor (~> 0.19.4)
tins (~> 1.6)
crass (1.0.4)
crass (1.0.6)
daemons (1.2.6)
dalli (2.7.6)
database_cleaner (1.7.0)
Expand Down Expand Up @@ -224,18 +224,18 @@ GEM
railties (>= 3.1)
json (2.1.0)
jwt (1.5.6)
kaminari (1.1.1)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.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.1.1)
kaminari-activerecord (1.1.1)
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
kgio (2.11.2)
knapsack_pro (1.1.0)
rake
Expand All @@ -248,7 +248,7 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
loofah (2.2.3)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -262,8 +262,8 @@ GEM
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
mini_portile2 (2.4.0)
minitest (5.14.1)
mixlib-cli (1.7.0)
mixlib-config (2.2.13)
tomlrb
Expand All @@ -274,8 +274,8 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (5.0.2)
newrelic_rpm (4.1.0.333)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
nori (2.6.0)
oauth (0.5.3)
oauth2 (1.4.0)
Expand Down Expand Up @@ -350,8 +350,8 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (4.2.11)
actionpack (= 4.2.11)
activesupport (= 4.2.11)
Expand Down Expand Up @@ -469,7 +469,7 @@ GEM
rack (>= 1.3, < 3)
rack-accept (~> 0.4)
tilt (>= 1.4, < 3)
tzinfo (1.2.5)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (4.1.19)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -540,7 +540,7 @@ DEPENDENCIES
jquery-fileupload-rails
jquery-rails (~> 4.3.3)
jquery-ui-rails (~> 6.0.1)
kaminari (~> 1.1.1)
kaminari (~> 1.2.1)
knapsack_pro (~> 1.1.0)
launchy (~> 2.4.3)
letter_opener_web (~> 1.3.4)
Expand Down