mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-27 01:24:07 +01:00
Merge remote-tracking branch 'origin/master' into bug/#2259_charts_quality
This commit is contained in:
Jyri-Petteri Paloposki
commit
f7bad05dad
20 changed files with 205 additions and 101 deletions
66
Gemfile.lock
66
Gemfile.lock
|
|
@ -70,11 +70,11 @@ GEM
|
|||
autoprefixer-rails (>= 5.2.1)
|
||||
sassc (>= 2.0.0)
|
||||
builder (3.2.3)
|
||||
bullet (6.0.0)
|
||||
bullet (6.0.1)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.11)
|
||||
byebug (11.0.1)
|
||||
childprocess (1.0.1)
|
||||
childprocess (2.0.0)
|
||||
rake (< 13.0)
|
||||
climate_control (0.2.0)
|
||||
codeclimate-test-reporter (1.0.7)
|
||||
|
|
@ -87,10 +87,10 @@ GEM
|
|||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
concurrent-ruby (1.1.5)
|
||||
crass (1.0.4)
|
||||
crass (1.0.5)
|
||||
database_cleaner (1.7.0)
|
||||
diff-lcs (1.3)
|
||||
docile (1.3.1)
|
||||
docile (1.3.2)
|
||||
erubi (1.8.0)
|
||||
execjs (2.7.0)
|
||||
factory_bot (4.11.1)
|
||||
|
|
@ -106,20 +106,20 @@ GEM
|
|||
htmlentities (4.3.4)
|
||||
i18n (1.6.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jaro_winkler (1.5.2)
|
||||
jquery-rails (4.3.3)
|
||||
jaro_winkler (1.5.3)
|
||||
jquery-rails (4.3.5)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
json (2.1.0)
|
||||
json (2.2.0)
|
||||
libv8 (3.16.14.19)
|
||||
listen (3.1.5)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
ruby_dep (~> 1.2)
|
||||
loofah (2.2.3)
|
||||
loofah (2.3.1)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
|
|
@ -132,15 +132,15 @@ GEM
|
|||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mimemagic (0.3.3)
|
||||
mini_mime (1.0.1)
|
||||
mini_mime (1.0.2)
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.11.3)
|
||||
minitest-stub-const (0.6)
|
||||
mocha (1.8.0)
|
||||
mocha (1.9.0)
|
||||
metaclass (~> 0.0.1)
|
||||
mysql2 (0.5.2)
|
||||
nio4r (2.3.1)
|
||||
nokogiri (1.10.3)
|
||||
nio4r (2.5.1)
|
||||
nokogiri (1.10.4)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.1)
|
||||
nokogiri (~> 1.8, >= 1.8.4)
|
||||
|
|
@ -153,7 +153,8 @@ GEM
|
|||
parallel (1.17.0)
|
||||
parser (2.6.3.0)
|
||||
ast (~> 2.4.0)
|
||||
puma (3.12.1)
|
||||
puma (4.1.1)
|
||||
nio4r (~> 2.0)
|
||||
rack (2.0.7)
|
||||
rack-mini-profiler (1.0.2)
|
||||
rack (>= 1.2.0)
|
||||
|
|
@ -179,7 +180,7 @@ GEM
|
|||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.0.4)
|
||||
rails-html-sanitizer (1.2.0)
|
||||
loofah (~> 2.2, >= 2.2.2)
|
||||
rails_autolink (1.1.6)
|
||||
rails (> 3.1)
|
||||
|
|
@ -190,7 +191,7 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
thor (>= 0.19.0, < 2.0)
|
||||
rainbow (3.0.0)
|
||||
rake (12.3.2)
|
||||
rake (12.3.3)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-inotify (0.10.0)
|
||||
ffi (~> 1.0)
|
||||
|
|
@ -199,7 +200,7 @@ GEM
|
|||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-support (3.8.2)
|
||||
rubocop (0.71.0)
|
||||
rubocop (0.74.0)
|
||||
jaro_winkler (~> 1.5.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.6)
|
||||
|
|
@ -208,13 +209,13 @@ GEM
|
|||
unicode-display_width (>= 1.4.0, < 1.7)
|
||||
ruby-progressbar (1.10.1)
|
||||
ruby_dep (1.5.0)
|
||||
rubyzip (1.2.2)
|
||||
safe_yaml (1.0.4)
|
||||
rubyzip (1.2.4)
|
||||
safe_yaml (1.0.5)
|
||||
sanitize (5.0.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.8.0)
|
||||
nokogumbo (~> 2.0)
|
||||
sass (3.7.3)
|
||||
sass (3.7.4)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
|
|
@ -228,16 +229,15 @@ GEM
|
|||
sassc (2.0.0)
|
||||
ffi (~> 1.9.6)
|
||||
rake
|
||||
selenium-webdriver (3.142.3)
|
||||
childprocess (>= 0.5, < 2.0)
|
||||
selenium-webdriver (3.142.4)
|
||||
childprocess (>= 0.5, < 3.0)
|
||||
rubyzip (~> 1.2, >= 1.2.2)
|
||||
simplecov (0.16.1)
|
||||
simplecov (0.17.0)
|
||||
docile (~> 1.1)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.2)
|
||||
spring (2.0.2)
|
||||
activesupport (>= 4.2)
|
||||
spring (2.1.0)
|
||||
sprockets (3.7.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
|
|
@ -254,7 +254,7 @@ GEM
|
|||
thor (0.20.3)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.8)
|
||||
tolk (3.1.0)
|
||||
tolk (3.2.1)
|
||||
rails (>= 5.0)
|
||||
safe_yaml (>= 0.8.6)
|
||||
sass
|
||||
|
|
@ -264,11 +264,11 @@ GEM
|
|||
execjs (>= 0.3.0, < 3)
|
||||
unicode-display_width (1.6.0)
|
||||
uniform_notifier (1.12.1)
|
||||
websocket-driver (0.7.0)
|
||||
websocket-driver (0.7.1)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.3)
|
||||
will_paginate (3.1.7)
|
||||
yard (0.9.19)
|
||||
websocket-extensions (0.1.4)
|
||||
will_paginate (3.1.8)
|
||||
yard (0.9.20)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -290,21 +290,21 @@ DEPENDENCIES
|
|||
factory_bot_rails
|
||||
font-awesome-sass (~> 4.5.0)
|
||||
htmlentities
|
||||
jquery-rails (~> 4.0)
|
||||
jquery-rails (~> 4.3)
|
||||
jquery-ui-rails (~> 5.0.5)
|
||||
listen
|
||||
minitest-stub-const
|
||||
mocha
|
||||
mysql2 (~> 0.5.2)
|
||||
paperclip
|
||||
puma (~> 3.12)
|
||||
puma (~> 4.1)
|
||||
rack-mini-profiler
|
||||
rails (~> 5.2.3)
|
||||
rails-controller-testing
|
||||
rails-dom-testing (~> 2.0.0)
|
||||
rails_autolink
|
||||
rspec-expectations
|
||||
rubocop (~> 0.71)
|
||||
rubocop (~> 0.74)
|
||||
sanitize (~> 5.0)
|
||||
sass-rails (~> 5.0)
|
||||
selenium-webdriver (~> 3.142)
|
||||
|
|
@ -312,7 +312,7 @@ DEPENDENCIES
|
|||
spring
|
||||
sqlite3
|
||||
therubyracer
|
||||
tolk (~> 3.1.0)
|
||||
tolk (~> 3.2.1)
|
||||
uglifier (>= 1.3.0)
|
||||
will_paginate
|
||||
yard
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue