Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-04 06:51:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into dependabot/bundler/jquery-ui-rails-6.0.1

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2020-08-18 15:46:47 +03:00
commit 90653568ef
55 changed files with 594 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gemfile
View file

@ -29,14 +29,14 @@ gem "RedCloth"
gem "sanitize", "~> 5.2"
gem "will_paginate"
gem "acts_as_list"
gem "aasm", '~> 3.4.0'
gem "aasm", '~> 4.12.3'
gem "htmlentities"
gem "rails_autolink"
gem 'puma', '~> 4.3'
gem 'paperclip'
# To use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.13'
gem 'bcrypt', '~> 3.1.15'
gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git'
@ -53,7 +53,7 @@ group :development do
gem "spring"
gem "yard"
gem 'tolk', '~> 3.2.1'
gem 'tolk', '~> 4.0.0'
gem "bullet"
gem "rack-mini-profiler"
@ -63,7 +63,7 @@ end
group :development, :test do
gem 'byebug'
gem 'listen'
gem "rubocop", "~> 0.88", require: false
gem "rubocop", "~> 0.89", require: false
end
group :test do