Skip to content

Commit

Permalink
Merge ae70452 into 898b450
Browse files Browse the repository at this point in the history
  • Loading branch information
happyvig committed Dec 15, 2022
2 parents 898b450 + ae70452 commit daf6568
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 32 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ gem 'i18n-js', '3.2.3'
#gem 'sqlite3', '~> 1.3.13'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 5.0', '>= 5.0.7'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
gem 'coffee-rails', '~> 4.1.1'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

Expand Down Expand Up @@ -45,7 +45,7 @@ end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem 'web-console', '~> 2.3', '>= 2.3.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
# gem 'spring'
Expand Down
72 changes: 43 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.4)
binding_of_caller (0.8.0)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.0.1)
Expand All @@ -47,12 +47,13 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
crass (1.0.5)
debug_inspector (0.0.3)
concurrent-ruby (1.1.10)
crass (1.0.6)
date (3.3.1)
debug_inspector (1.1.0)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.11.3)
execjs (2.8.1)
ffi (1.15.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (0.9.5)
Expand All @@ -61,22 +62,36 @@ GEM
i18n (>= 0.6.6)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jquery-rails (4.3.5)
jquery-rails (4.5.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
loofah (2.4.0)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.0)
mini_mime (>= 0.1.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.13.0)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
rack (1.6.12)
net-imap
net-pop
net-smtp
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.3)
net-imap (0.3.2)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
racc (1.6.1)
rack (1.6.13)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.11.1)
Expand All @@ -90,21 +105,21 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
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.3.0)
loofah (~> 2.3)
rails-html-sanitizer (1.4.4)
loofah (~> 2.19, >= 2.19.1)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (13.0.1)
rb-fsevent (0.10.3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (4.3.0)
Expand All @@ -125,18 +140,18 @@ GEM
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
thor (1.0.1)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10)
tilt (2.0.11)
timeout (0.3.1)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.6)
tzinfo (1.2.10)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
Expand All @@ -151,19 +166,18 @@ PLATFORMS

DEPENDENCIES
byebug
coffee-rails (~> 4.1.0)
coffee-rails (~> 4.1.1)
i18n (= 0.9.5)
i18n-js (= 3.2.3)
jbuilder (~> 2.0)
jquery-rails
rails (= 4.2.11.1)
rake (= 13.0.1)
sass-rails (~> 5.0)
sass-rails (~> 5.0, >= 5.0.7)
sdoc (~> 0.4.0)
sqlite3 (~> 1.3.13)
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
web-console (~> 2.3, >= 2.3.0)

BUNDLED WITH
1.16.6
1.17.3

0 comments on commit daf6568

Please sign in to comment.