Skip to content

Bump puma from 2.16.0 to 5.3.2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump puma from 2.16.0 to 5.3.2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65f7be5
Change the homepage video
mitio Jul 12, 2021
d40b08f
Remove one of the homepage's sections
mitio Jul 12, 2021
351b888
Bump puma from 2.16.0 to 5.3.2
dependabot[bot] Jul 12, 2021
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
7 changes: 2 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
source 'https://rubygems.org'

ruby '2.3.1'

gem 'rails', '4.2.5.2'
gem 'rails', '~> 4.2.11'
gem 'rails-i18n', '~> 4.0.0'
gem 'pg'
gem 'pg', '~> 0.18'
gem 'sass-rails', '~> 5.0.4'
gem 'uglifier', '>= 1.3.0'

Expand All @@ -27,7 +25,6 @@ gem 'angular-ui-bootstrap-rails'
gem 'figaro'
gem 'showdown-rails'
gem 'puma'
gem 'therubyracer'
gem 'exception_notification'

group :development do
Expand Down
143 changes: 70 additions & 73 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,37 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
actionmailer (4.2.11.3)
actionpack (= 4.2.11.3)
actionview (= 4.2.11.3)
activejob (= 4.2.11.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5.2)
actionview (= 4.2.5.2)
activesupport (= 4.2.5.2)
actionpack (4.2.11.3)
actionview (= 4.2.11.3)
activesupport (= 4.2.11.3)
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.5.2)
activesupport (= 4.2.5.2)
actionview (4.2.11.3)
activesupport (= 4.2.11.3)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5.2)
activesupport (= 4.2.5.2)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.11.3)
activesupport (= 4.2.11.3)
globalid (>= 0.3.0)
activemodel (4.2.5.2)
activesupport (= 4.2.5.2)
activemodel (4.2.11.3)
activesupport (= 4.2.11.3)
builder (~> 3.1)
activerecord (4.2.5.2)
activemodel (= 4.2.5.2)
activesupport (= 4.2.5.2)
activerecord (4.2.11.3)
activemodel (= 4.2.11.3)
activesupport (= 4.2.11.3)
arel (~> 6.0)
activesupport (4.2.5.2)
activesupport (4.2.11.3)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
Expand All @@ -61,7 +60,7 @@ GEM
angularjs-rails (1.3.15)
arbre (1.0.3)
activesupport (>= 3.0.0)
arel (6.0.3)
arel (6.0.4)
autoprefixer-rails (6.3.1)
execjs
json
Expand All @@ -78,7 +77,7 @@ GEM
bourbon (4.2.6)
sass (~> 3.4)
thor (~> 0.19)
builder (3.2.2)
builder (3.2.4)
cancancan (1.13.1)
capistrano (3.4.0)
i18n
Expand All @@ -101,7 +100,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
concurrent-ruby (1.1.9)
crass (1.0.6)
debug_inspector (0.0.2)
devise (3.5.6)
bcrypt (~> 3.0)
Expand All @@ -125,13 +125,14 @@ GEM
formtastic (3.1.3)
actionpack (>= 3.2.13)
formtastic_i18n (0.5.0)
globalid (0.3.6)
activesupport (>= 4.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
has_scope (0.6.0)
actionpack (>= 3.2, < 5)
activesupport (>= 3.2, < 5)
hashie (3.4.3)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
inherited_resources (1.6.0)
actionpack (>= 3.2, < 5)
has_scope (~> 0.6.0.rc)
Expand All @@ -146,7 +147,7 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
json (1.8.6)
jwt (1.5.1)
kaminari (0.16.3)
actionpack (>= 3.0.0)
Expand All @@ -155,22 +156,24 @@ GEM
addressable (~> 2.3)
letter_opener (1.4.1)
launchy (~> 2.2)
libv8 (3.16.14.15)
loofah (2.0.3)
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.99.1)
mini_portile2 (2.0.0)
minitest (5.8.4)
mail (2.7.1)
mini_mime (>= 0.1.1)
mini_mime (1.1.0)
mini_portile2 (2.5.3)
minitest (5.14.4)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.0.2)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nio4r (2.5.7)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0, < 1.5.2)
Expand All @@ -186,34 +189,36 @@ GEM
oauth2 (~> 1.0)
omniauth (~> 1.2)
orm_adapter (0.5.0)
pg (0.18.4)
pg (0.21.0)
polyamorous (1.3.0)
activerecord (>= 3.0)
puma (2.16.0)
puma (5.3.2)
nio4r (~> 2.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.4)
racc (1.5.2)
rack (1.6.13)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5.2)
actionmailer (= 4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
activemodel (= 4.2.5.2)
activerecord (= 4.2.5.2)
activesupport (= 4.2.5.2)
rails (4.2.11.3)
actionmailer (= 4.2.11.3)
actionpack (= 4.2.11.3)
actionview (= 4.2.11.3)
activejob (= 4.2.11.3)
activemodel (= 4.2.11.3)
activerecord (= 4.2.11.3)
activesupport (= 4.2.11.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.2)
railties (= 4.2.11.3)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-i18n (4.0.8)
i18n (~> 0.7)
railties (~> 4.0)
Expand All @@ -222,12 +227,12 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.4)
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
railties (4.2.11.3)
actionpack (= 4.2.11.3)
activesupport (= 4.2.11.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
rake (13.0.6)
ransack (1.7.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
Expand All @@ -236,7 +241,6 @@ GEM
polyamorous (~> 1.2)
rdoc (4.2.1)
json (~> 1.4)
ref (2.0.0)
responders (2.1.1)
railties (>= 4.2.0, < 5.1)
sass (3.4.21)
Expand All @@ -253,23 +257,20 @@ GEM
actionpack (>= 3.1)
railties (>= 3.1)
spring (1.6.2)
sprockets (3.5.2)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.8.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.5)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.2)
tzinfo (1.2.2)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
Expand Down Expand Up @@ -303,21 +304,17 @@ DEPENDENCIES
kaminari
letter_opener
omniauth-facebook
pg
pg (~> 0.18)
puma
quiet_assets
rails (= 4.2.5.2)
rails (~> 4.2.11)
rails-i18n (~> 4.0.0)
rails_12factor
sass-rails (~> 5.0.4)
sdoc (~> 0.4.0)
showdown-rails
spring
therubyracer
uglifier (>= 1.3.0)

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.12.5
1.17.3
2 changes: 1 addition & 1 deletion app/assets/templates/home.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
<br />

<div class="embed-responsive embed-responsive-16by9">
<iframe width="560" height="315" src="https://www.youtube.com/embed/G6uOEXZ8UCs" frameborder="0" allowfullscreen></iframe>
<iframe width="560" height="315" src="https://www.youtube.com/embed/8vJHZuMO1Wo" frameborder="0" allowfullscreen></iframe>
</div>

23 changes: 0 additions & 23 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,29 +180,6 @@
<br />
<hr />

<p class="text-center text-muted"><small>Съмишленици</small></p>

<div class="row">
<div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "http://yatoto.com/" do image_tag "yatoto_logo.png", class: "center-block", width: "70%" end %></div><!--
--><div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "http://smart-f.eu/" do image_tag "smart_foundation_logo.png", class: "center-block", width: "70%" end %></div><!--
--><div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "http://www.bcaf.bg/" do image_tag "fbpp_logo.png", class: "center-block", width: "70%" end %></div><!--
--><div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "http://365association.org/" do image_tag "365_logo.png", class: "center-block", width: "70%" end %></div>
</div>

<div class="row">
<div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "http://www.banitza.net/" do image_tag "banitza_logo.png", class: "center-block", width: "70%" end %></div><!--
--><div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "http://prozrachniplanini.org/" do image_tag "prozrachni_planini_logo.png", class: "center-block", width: "70%" end %></div><!--
--><div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "https://www.facebook.com/SocialEnterpriseConsultingBG" do image_tag "social_enterprise_consulting_bg.png", class: "center-block", width: "70%" end %></div><!--
--><div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "http://ideasfactorybg.org/" do image_tag "ideas_factory_logo.png", class: "center-block", width: "70%" end %></div>
</div>

<div class="row">
<div class="col-md-3 col-sm-3 col-xs-6 vcenter"><%= link_to "http://free-spirit-city.eu/" do image_tag "rcfs_logo.png", class: "center-block", width: "70%" end %></div>
</div>

<br />
<hr />

<p class="text-muted text-center">„Гласът ни“ е платформа с <%= link_to "отворен код", "http://github.com/obshtestvo/glasatni.bg" %>. За да се свържете с разработчиците, пишете на <%= link_to "info@obshtestvo.bg", "mailto:info@obshtestvo.bg" %>.</p>
<p class="text-muted text-center">Запознайте се с нашите <i>вълнуващи</i> <a href="/legal">общи правила за използване на сайта.</a></p>
<p class="text-muted text-center">Този продукт е създаден с финансовата подкрепа на <a href="http://www.ngogrants.bg/">Програмата за подкрепа на неправителствени организации в България</a> по <a href="http://www.eeagrants.bg/bg/2009-2014/%D0%BE%D0%B1%D1%89%D0%B0-%D0%B8%D0%BD%D1%84%D0%BE%D1%80%D0%BC%D0%B0%D1%86%D0%B8%D1%8F/">Финансовия механизъм на Европейското икономическо пространство</a>. Цялата отговорност за съдържанието на документа се носи от <a href="http://bcnl.org">Фондация Български център за нестопанско право</a> и при никакви обстоятелства не може да се приема, че този документ отразява официалното становище на Финансовия механизъм на Европейското икономическо пространство и Оператора на Програмата за
Expand Down