From 4710427fe1830e93cce87459517d31d6ed885e23 Mon Sep 17 00:00:00 2001 From: Jonas Hellmann Date: Mon, 20 May 2024 10:23:54 +0000 Subject: [PATCH] Revert "Fix version of sqlite3 gem" This reverts commit 3e8ccbaa330620f5ce78fb460185eedf8b630d53. --- Gemfile | 6 +++++- Gemfile.lock | 23 +++++++++++++++++++++-- app/controllers/version_controller.rb | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 755fb0a..fefec61 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,14 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '>=7.0.8' # Use sqlite3 as the database for Active Record -gem 'sqlite3', '~>1.4' +gem 'sqlite3' gem 'mysql2', '~> 0.5' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 1944f01..d8f5b31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,6 +95,7 @@ GEM drb (2.2.1) erubi (1.12.0) execjs (2.9.1) + ffi (1.16.3) globalid (1.2.1) activesupport (>= 6.1) hashery (2.1.2) @@ -124,6 +125,7 @@ GEM net-smtp marcel (1.0.4) mini_mime (1.1.5) + mini_portile2 (2.8.6) minitest (5.23.0) mutex_m (0.2.0) mysql2 (0.5.6) @@ -188,11 +190,25 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) rdoc (6.6.3.1) psych (>= 4.0.0) reline (0.5.7) io-console (~> 0.5) ruby-rc4 (0.1.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.1.0) + railties (>= 5.2.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) sdoc (1.1.0) rdoc (>= 5.0) spring (4.2.1) @@ -204,9 +220,11 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.7.3-x86_64-linux) + sqlite3 (2.0.1) + mini_portile2 (~> 2.8.0) stringio (3.1.0) thor (1.3.1) + tilt (2.3.0) timeout (0.4.1) ttfunk (1.8.0) bigdecimal (~> 3.1) @@ -243,9 +261,10 @@ DEPENDENCIES pdf-reader rack-cors rails (>= 7.0.8) + sass-rails (~> 5.0) sdoc (~> 1.1.0) spring - sqlite3 (~> 1.4) + sqlite3 turbolinks uglifier (>= 1.3.0) web-console (~> 2.0) diff --git a/app/controllers/version_controller.rb b/app/controllers/version_controller.rb index 8c0d592..2d3707b 100644 --- a/app/controllers/version_controller.rb +++ b/app/controllers/version_controller.rb @@ -3,7 +3,7 @@ class VersionController < ApplicationController # GET /version def version - version = '1.5.3' + version = '1.5.2' json_response(version: version) end end