Rene/wedding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Rene:461cb62f81cf0b1397ecb07e28034861c6bb494d
Branches Tags
Rene:master Rene:redo
...
compare: Rene:8a14419628dd3e6439d068ed8dfba2a6bc17710c
Branches Tags
Rene:master Rene:redo

10 Commits
461cb62f81 ... 8a14419628

Author SHA1 Message Date
John Lees-Miller
8a14419628 Merge pull request #28 from jdleesmiller/dependabot/bundler/puma-4.3.12
Some checks failed
CI / build (push) Has been cancelled
Details 
Bump puma from 4.3.8 to 4.3.12
 2022-05-01 09:59:13 +01:00
dependabot[bot]
87fb00da53 Bump puma from 4.3.8 to 4.3.12 
Bumps [puma](https://github.com/puma/puma) from 4.3.8 to 4.3.12.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.8...v4.3.12)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-30 20:13:19 +00:00
John Lees-Miller
2d8e3a3b94 Merge pull request #29 from jdleesmiller/dependabot/bundler/nokogiri-1.13.4 
Bump nokogiri from 1.11.5 to 1.13.4
 2022-04-30 21:13:01 +01:00
John Lees-Miller
3d2d70f4f5 Merge pull request #21 from jdleesmiller/dependabot/bundler/addressable-2.8.0 
Bump addressable from 2.5.2 to 2.8.0
 2022-04-30 21:11:58 +01:00
dependabot[bot]
41debe6baf Bump nokogiri from 1.11.5 to 1.13.4 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.5 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.5...v1.13.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-12 01:01:32 +00:00
dependabot[bot]
730cc9d95a Bump addressable from 2.5.2 to 2.8.0 
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.8.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.8.0)

---
updated-dependencies:
- dependency-name: addressable
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-13 00:46:37 +00:00
John Lees-Miller
7ce16f0602 Merge pull request #20 from jdleesmiller/dependabot/bundler/nokogiri-1.11.5 
Bump nokogiri from 1.10.9 to 1.11.5
 2021-05-20 20:44:19 +01:00
dependabot[bot]
43a2549e51 Bump nokogiri from 1.10.9 to 1.11.5 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.9 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.9...v1.11.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-20 14:19:15 +00:00
John Lees-Miller
3d8842ec47 Merge pull request #18 from jdleesmiller/dependabot/bundler/puma-4.3.8 
Bump puma from 3.12.6 to 4.3.8
 2021-05-20 15:18:29 +01:00
dependabot[bot]
0d2e3c4dae Bump puma from 3.12.6 to 4.3.8 
Bumps [puma](https://github.com/puma/puma) from 3.12.6 to 4.3.8.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.12.6...v4.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-19 00:48:20 +00:00
2 changed files with 13 additions and 10 deletions
Expand all files Collapse all files

2
Gemfile
View File

@ -12,7 +12,7 @@ gem 'rails', '~> 5.2.4.3'
# Use postgresql as the database for Active Record # Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0' gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server # Use Puma as the app server
gem 'puma', '~> 3.12' gem 'puma', '~> 4.3'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0' gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets

21
Gemfile.lock
View File

@ -53,8 +53,8 @@ GEM
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.5.2) addressable (2.8.0)
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 5.0)
arbre (1.2.1) arbre (1.2.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
arel (9.0.0) arel (9.0.0)
@ -142,12 +142,13 @@ GEM
nokogiri (~> 1) nokogiri (~> 1)
rake rake
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.8.0)
minitest (5.14.1) minitest (5.14.1)
multi_json (1.13.1) multi_json (1.13.1)
nio4r (2.5.2) nio4r (2.5.8)
nokogiri (1.10.9) nokogiri (1.13.4)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.8.0)
racc (~> 1.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.19.1) parallel (1.19.1)
parser (2.7.1.3) parser (2.7.1.3)
@ -156,8 +157,10 @@ GEM
polyamorous (2.3.2) polyamorous (2.3.2)
activerecord (>= 5.2.1) activerecord (>= 5.2.1)
popper_js (1.14.5) popper_js (1.14.5)
public_suffix (3.0.2) public_suffix (4.0.6)
puma (3.12.6) puma (4.3.12)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.3) rack (2.2.3)
rack-canonical-host (0.2.3) rack-canonical-host (0.2.3)
addressable (> 0, < 3) addressable (> 0, < 3)
@ -290,7 +293,7 @@ DEPENDENCIES
jquery-rails jquery-rails
listen (>= 3.0.5, < 3.2) listen (>= 3.0.5, < 3.2)
pg (>= 0.18, < 2.0) pg (>= 0.18, < 2.0)
puma (~> 3.12) puma (~> 4.3)
rack-canonical-host rack-canonical-host
rails (~> 5.2.4.3) rails (~> 5.2.4.3)
recaptcha recaptcha