Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

attempt to upgrade rails #21

Open
wants to merge 8 commits into
base: security-vulnerabilities
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: ruby
rvm:
- "2.0.0"
- "2.3.0"
# - "1.9.2"
# uncomment this line if your project needs to run something other than `rake`:
# script: bundle exec rspec spec
before_script:
- mysql -e 'create database browsercms_test;'
- mysql -e 'create database browsercms_test;'
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

ruby '2.3.3'
ruby '2.5.8'

# Load this project as a gem.
gemspec
Expand All @@ -25,16 +25,17 @@ end
group :development do
gem 'rake'
# gem 'debugger'
gem 'quiet_assets'
# gem 'quiet_assets'
gem 'better_errors'
gem 'binding_of_caller'
gem 'pry'
end
group :test, :development do
gem 'minitest', '~>5.3.3'
gem 'minitest'
gem "test-unit", "~> 3.0"
gem 'minitest-rails', '~>2.0.0'
gem 'minitest-rails'
gem 'minitest-reporters', '~>1.0.0'
gem 'rails-controller-testing'
end

group :test do
Expand Down
203 changes: 108 additions & 95 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,78 +1,82 @@
PATH
remote: .
specs:
browsercms (4.2.8.rc1)
actionpack-page_caching (~> 1.2.4)
browsercms (5.0.2.rc1)
actionpack-page_caching (~> 1.0)
ancestry (~> 2.0.0)
bootstrap-sass
ckeditor_rails
compass-rails (~> 3.0.0)
devise (~> 4.7.1)
jquery-rails
jquery-ui-rails
devise (~> 4.7.0)
jquery-rails (~> 4.3.1)
jquery-ui-rails (= 6.0.1)
panoramic
paperclip
rails (~> 4.2.0)
paperclip (= 6.0.0)
rails (~> 5.0.2)
sass-rails
sassc (~> 2.1.0)
simple_form (~> 3.1.0)
simple_form (~> 3.3.0)
term-ansicolor
underscore-rails (~> 1.4)
will_paginate (~> 3.0.0)

GEM
remote: http://rubygems.org/
specs:
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
actioncable (5.0.7.2)
actionpack (= 5.0.7.2)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.7.2)
actionpack (= 5.0.7.2)
actionview (= 5.0.7.2)
activejob (= 5.0.7.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
actionpack (5.0.7.2)
actionview (= 5.0.7.2)
activesupport (= 5.0.7.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.2.4)
actionpack (>= 4.0.0)
actionview (4.2.8)
activesupport (= 4.2.8)
actionview (5.0.7.2)
activesupport (= 5.0.7.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.8)
i18n (~> 0.7)
activejob (5.0.7.2)
activesupport (= 5.0.7.2)
globalid (>= 0.3.6)
activemodel (5.0.7.2)
activesupport (= 5.0.7.2)
activerecord (5.0.7.2)
activemodel (= 5.0.7.2)
activesupport (= 5.0.7.2)
arel (~> 7.0)
activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
ancestry (2.0.0)
activerecord (>= 3.0.0)
ansi (1.5.0)
arel (6.0.4)
arel (7.1.4)
aruba (0.14.2)
childprocess (~> 0.5.6)
contracts (~> 0.9)
cucumber (>= 1.3.19)
ffi (~> 1.9.10)
rspec-expectations (>= 2.99)
thor (~> 0.19)
autoprefixer-rails (9.8.6)
execjs
autoprefixer-rails (10.3.3.0)
execjs (~> 2)
bcrypt (3.1.16)
better_errors (2.1.1)
coderay (>= 1.0.0)
Expand All @@ -84,7 +88,7 @@ GEM
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.3)
builder (3.2.4)
capybara (2.13.0)
addressable
mime-types (>= 1.16)
Expand All @@ -95,6 +99,8 @@ GEM
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.4.0)
ckeditor_rails (4.10.0)
railties (>= 3.0)
climate_control (0.2.0)
cliver (0.3.2)
coderay (1.1.1)
Expand All @@ -114,8 +120,9 @@ GEM
compass (~> 1.0.0)
sass-rails (< 5.1)
sprockets (< 4.0)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.9)
contracts (0.15.0)
crass (1.0.6)
cucumber (2.4.0)
builder (>= 2.1.2)
cucumber-core (~> 1.5.0)
Expand Down Expand Up @@ -153,18 +160,20 @@ GEM
railties (>= 3.0.0)
ffi (1.9.18)
gherkin (4.1.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (0.8.1)
jquery-rails (4.4.0)
globalid (0.5.2)
activesupport (>= 5.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.0.3)
loofah (2.12.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
m (1.5.0)
method_source (>= 0.6.7)
Expand All @@ -180,11 +189,11 @@ GEM
nokogiri (~> 1)
rake
mini_mime (1.1.1)
mini_portile2 (2.1.0)
minitest (5.3.5)
minitest-rails (2.0.3)
minitest (>= 5.3.3, < 6.0)
railties (~> 4.1)
mini_portile2 (2.6.1)
minitest (5.14.4)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.0.20)
ansi
builder
Expand All @@ -195,12 +204,14 @@ GEM
multi_json (1.12.1)
multi_test (0.1.2)
mysql2 (0.4.5)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
nio4r (2.5.8)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
orm_adapter (0.5.0)
panoramic (0.0.7)
rails (~> 4)
paperclip (6.1.0)
panoramic (0.0.6)
rails (>= 3.0.7)
paperclip (6.0.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
mime-types
Expand All @@ -216,42 +227,44 @@ GEM
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (2.0.5)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.5)
racc (1.5.2)
rack (2.2.3)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.8)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
rails (5.0.7.2)
actioncable (= 5.0.7.2)
actionmailer (= 5.0.7.2)
actionpack (= 5.0.7.2)
actionview (= 5.0.7.2)
activejob (= 5.0.7.2)
activemodel (= 5.0.7.2)
activerecord (= 5.0.7.2)
activesupport (= 5.0.7.2)
bundler (>= 1.3.0)
railties (= 5.0.7.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.1)
actionpack (~> 5.x)
actionview (~> 5.x)
activesupport (~> 5.x)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (5.0.7.2)
actionpack (= 5.0.7.2)
activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rake (13.0.6)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
Expand All @@ -267,9 +280,9 @@ GEM
tilt (>= 1.1, < 3)
sassc (2.1.0)
ffi (~> 1.9)
simple_form (3.1.1)
actionpack (~> 4.0)
activemodel (~> 4.0)
simple_form (3.3.1)
actionpack (> 4, < 5.1)
activemodel (> 4, < 5.1)
single_test (0.6.0)
rake
slop (3.6.0)
Expand All @@ -294,18 +307,18 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.19.4)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.7)
tins (1.29.1)
sync
tzinfo (1.2.2)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (3.1.9)
execjs (>= 0.3.0, < 3)
underscore-rails (1.8.3)
warden (1.2.7)
rack (>= 1.0)
warden (1.2.9)
rack (>= 2.0.9)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
Expand All @@ -330,14 +343,14 @@ DEPENDENCIES
factory_girl_rails (= 3.3.0)
launchy
m (~> 1.2)
minitest (~> 5.3.3)
minitest-rails (~> 2.0.0)
minitest
minitest-rails
minitest-reporters (~> 1.0.0)
mocha
mysql2
poltergeist
pry
quiet_assets
rails-controller-testing
rake
ruby-prof
sass-rails (~> 5.0.0)
Expand All @@ -350,7 +363,7 @@ DEPENDENCIES
yard

RUBY VERSION
ruby 2.3.3p222
ruby 2.5.8p224

BUNDLED WITH
1.17.3
Loading