Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-10 22:52:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into bug/#2259_charts_quality

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2019-11-13 13:58:26 +02:00
commit f7bad05dad
20 changed files with 205 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gemfile
View file

@ -15,7 +15,7 @@ gem 'therubyracer', group: :therubyracer
gem 'uglifier', '>=1.3.0'
gem 'jquery-rails' , '~> 4.0'
gem 'jquery-rails' , '~> 4.3'
gem 'jquery-ui-rails' , '~>5.0.5'
# you may comment out the database driver(s) you will not be using.
@ -32,7 +32,7 @@ gem "acts_as_list"
gem "aasm", '~> 3.4.0'
gem "htmlentities"
gem "rails_autolink"
gem 'puma', '~> 3.12'
gem 'puma', '~> 4.1'
gem 'paperclip'
# To use ActiveModel has_secure_password
@ -53,7 +53,7 @@ group :development do
gem "spring"
gem "yard"
gem 'tolk', '~> 3.1.0'
gem 'tolk', '~> 3.2.1'
gem "bullet"
gem "rack-mini-profiler"
@ -62,7 +62,7 @@ end
group :development, :test do
gem 'byebug'
gem 'listen'
gem "rubocop", "~> 0.71", require: false
gem "rubocop", "~> 0.74", require: false
end
group :test do