Skip to content

Commit

Permalink
Bumping rails version
Browse files Browse the repository at this point in the history
  • Loading branch information
@alaxalves
alaxalves committed Jul 11, 2019
1 parent 553d8ea commit e5b3320
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 80 deletions.
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

ruby '2.4.6'
gem 'rails', '~> 5.2.3'
ruby '2.6.3'
gem 'rails', '~> 6.0.0.rc1'
gem 'rake', '~> 12.3.2'
gem 'tzinfo-data'
gem 'skylight'
Expand Down
131 changes: 62 additions & 69 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,62 @@ GEM
RubyInline (3.12.4)
ZenTest (~> 4.3)
ZenTest (4.11.2)
actioncable (5.2.3)
actionpack (= 5.2.3)
actioncable (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
actionmailbox (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
activejob (= 6.0.0.rc1)
activerecord (= 6.0.0.rc1)
activestorage (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
mail (>= 2.7.1)
actionmailer (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
actionview (= 6.0.0.rc1)
activejob (= 6.0.0.rc1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
actionpack (6.0.0.rc1)
actionview (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
actiontext (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
activerecord (= 6.0.0.rc1)
activestorage (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
nokogiri (>= 1.8.5)
actionview (6.0.0.rc1)
activesupport (= 6.0.0.rc1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3)
activesupport (= 5.2.3)
activejob (6.0.0.rc1)
activesupport (= 6.0.0.rc1)
globalid (>= 0.3.6)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
activemodel (6.0.0.rc1)
activesupport (= 6.0.0.rc1)
activerecord (6.0.0.rc1)
activemodel (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
activestorage (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
activejob (= 6.0.0.rc1)
activerecord (= 6.0.0.rc1)
marcel (~> 0.3.1)
activesupport (5.2.3)
activesupport (6.0.0.rc1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.4)
ansi (1.5.0)
arel (9.0.0)
ast (2.4.0)
autoprefixer-rails (9.5.1.1)
execjs
Expand All @@ -72,16 +85,10 @@ GEM
concurrent-ruby (1.1.5)
crass (1.0.4)
docile (1.3.2)
equatable (0.6.1)
erubi (1.8.0)
execjs (2.7.0)
faker (1.9.4)
faker (1.9.6)
i18n (>= 0.7)
pastel (~> 0.7.2)
thor (~> 0.20.0)
tty-pager (~> 0.12.0)
tty-screen (~> 0.6.5)
tty-tree (~> 0.3.0)
ffi (1.11.1)
friendly_id (5.2.5)
activerecord (>= 4.0.0)
Expand Down Expand Up @@ -126,7 +133,7 @@ GEM
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_magick (4.9.3)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_racer (0.2.6)
libv8 (>= 6.9.411)
Expand All @@ -141,7 +148,7 @@ GEM
multi_xml (0.6.0)
mysql2 (0.5.2)
net-http-persistent (2.9.4)
nio4r (2.3.1)
nio4r (2.4.0)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
oa-core (0.3.2)
Expand All @@ -163,9 +170,6 @@ GEM
passenger (6.0.2)
rack
rake (>= 0.8.1)
pastel (0.7.3)
equatable (~> 0.6)
tty-color (~> 0.5)
popper_js (1.14.5)
pry (0.12.2)
coderay (~> 1.1.0)
Expand All @@ -178,18 +182,20 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
rails (6.0.0.rc1)
actioncable (= 6.0.0.rc1)
actionmailbox (= 6.0.0.rc1)
actionmailer (= 6.0.0.rc1)
actionpack (= 6.0.0.rc1)
actiontext (= 6.0.0.rc1)
actionview (= 6.0.0.rc1)
activejob (= 6.0.0.rc1)
activemodel (= 6.0.0.rc1)
activerecord (= 6.0.0.rc1)
activestorage (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
bundler (>= 1.3.0)
railties (= 5.2.3)
railties (= 6.0.0.rc1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x)
Expand All @@ -201,12 +207,12 @@ GEM
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-perftest (0.0.7)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
railties (6.0.0.rc1)
actionpack (= 6.0.0.rc1)
activesupport (= 6.0.0.rc1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rb-fsevent (0.10.3)
Expand Down Expand Up @@ -275,35 +281,21 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.4.1)
strings (0.1.5)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.1.0)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
tty-color (0.5.0)
tty-pager (0.12.1)
strings (~> 0.1.4)
tty-screen (~> 0.6)
tty-which (~> 0.4)
tty-screen (0.6.5)
tty-tree (0.3.0)
tty-which (0.4.1)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
tzinfo-data (1.2019.1)
tzinfo-data (1.2019.2)
tzinfo (>= 1.0.0)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.6.0)
unicode_utils (1.4.0)
url (0.3.2)
uuidtools (2.1.5)
web-console (3.7.0)
Expand All @@ -317,6 +309,7 @@ GEM
will_paginate (3.1.7)
will_paginate-bootstrap4 (0.2.2)
will_paginate (~> 3.0, >= 3.0.0)
zeitwerk (2.1.8)

PLATFORMS
ruby
Expand Down Expand Up @@ -348,7 +341,7 @@ DEPENDENCIES
passenger
popper_js (~> 1.11, >= 1.11.1)
pry-rails (~> 0.3.9)
rails (~> 5.2.3)
rails (~> 6.0.0.rc1)
rails-controller-testing
rails-perftest
rake (~> 12.3.2)
Expand Down Expand Up @@ -376,7 +369,7 @@ DEPENDENCIES
will_paginate-bootstrap4 (~> 0.2.2)

RUBY VERSION
ruby 2.4.6p354
ruby 2.6.3p62

BUNDLED WITH
1.17.3
1.17.2
18 changes: 9 additions & 9 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ image-sequencer@publiclab/image-sequencer#~1.4.0:
fisheyegl "^0.1.2"
font-awesome "~4.5.0"
get-pixels "~3.3.0"
imgareaselect "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
imgareaselect "https://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
jquery "~2"
jsqr "^0.2.2"
lodash "^4.17.5"
Expand All @@ -1199,9 +1199,9 @@ image-sequencer@publiclab/image-sequencer#~1.4.0:
save-pixels "~2.3.4"
urify "^2.1.0"

"imgareaselect@git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
"imgareaselect@https://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
version "0.9.11-rc.1"
resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
resolved "https://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"

inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
Expand Down Expand Up @@ -1478,18 +1478,18 @@ lazy-cache@^1.0.3:
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=

"leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location#main":
"leaflet-blurred-location@https://github.com/publiclab/leaflet-blurred-location#main":
version "1.3.0"
resolved "git://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
resolved "https://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
dependencies:
haversine-distance "^1.1.4"
jquery "^3.2.1"
leaflet "^1.3.3"

"leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location.git#main":
"leaflet-blurred-location@https://github.com/publiclab/leaflet-blurred-location.git#main":
version "1.3.0"
uid "1bff37cb96518bd87192277b14c290cba3c138ba"
resolved "git://github.com/publiclab/leaflet-blurred-location.git#1bff37cb96518bd87192277b14c290cba3c138ba"
resolved "https://github.com/publiclab/leaflet-blurred-location.git#1bff37cb96518bd87192277b14c290cba3c138ba"
dependencies:
haversine-distance "^1.1.4"
jquery "^3.2.1"
Expand Down Expand Up @@ -1518,7 +1518,7 @@ leaflet-environmental-layers@^1.3.6:
dependencies:
jquery "^3.3.1"
leaflet "^1.3.1"
leaflet-blurred-location "git://github.com/publiclab/leaflet-blurred-location#main"
leaflet-blurred-location "https://github.com/publiclab/leaflet-blurred-location#main"
leaflet-fullhash "github:sagarpreet-chadha/leaflet-fullHash"
leaflet-heatmap "1.0.0"
leaflet-providers "^1.1.17"
Expand Down Expand Up @@ -1586,7 +1586,7 @@ leaflet.blurred-location-display@^1.1.0:
integrity sha512-l7vtPdwGbo6Xqeds37DstKNMANiI8g7EUvKrQ34CcBebyz1GcBBnWGn2wq44uqWxvKgt3okZDWdm4i6tWwjKpQ==
dependencies:
jquery "^3.3.1"
leaflet-blurred-location "git://github.com/publiclab/leaflet-blurred-location#main"
leaflet-blurred-location "https://github.com/publiclab/leaflet-blurred-location#main"

leaflet@*, leaflet@Leaflet/Leaflet#^1.0.0, leaflet@^1.3.1, leaflet@^1.3.3:
version "1.5.1"
Expand Down

0 comments on commit e5b3320

Please sign in to comment.