Skip to content

Commit

Permalink
Bundle Update now that Rails 5.2 has been released, update travis.yml…
Browse files Browse the repository at this point in the history 
… for Ruby 2.5.1
  • Loading branch information
@brittanyjmartin
brittanyjmartin committed Apr 24, 2018
1 parent 784304e commit 7168909
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cache: bundler

language: ruby
rvm:
- 2.5.0
- 2.5.1

services: mysql

Expand Down
3 changes: 1 addition & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ gemspec

group :development, :test do
gem 'acts_as_list'
gem 'cocaine'
gem 'codeclimate-test-reporter'
gem 'database_cleaner'
gem 'factory_bot_rails'
gem 'launchy', '~> 2.4.2'
gem 'mysql2', '~> 0.4.2'
gem 'mysql2'
gem 'poltergeist', '~> 1.14.0'
gem 'pry-byebug'
gem 'rails-observers'
Expand Down
104 changes: 51 additions & 53 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,22 @@ PATH
acts_as_tree (~> 2.6.1)
bundler (~> 1.7)
ckeditor (~> 4.2.2)
cocaine (~> 0.5.8)
compass-rails (~> 3.0.2)
delocalize (~> 0.2)
execjs (~> 2.7)
haml (~> 5.0)
haml-rails (~> 1.0.0)
highline (~> 1.7.8)
kraken-io
mysql2 (~> 0.4.2)
mysql2
paperclip (> 5.2)
rack (~> 2.0.1)
rack-cache (~> 1.7)
radius (~> 0.7)
rails (~> 5.2.0.rc2)
rails (~> 5.2.0)
rake (< 11.0)
rdoc (~> 5.1)
roadie-rails (~> 1.2.1)
roadie-rails
stringex (~> 2.7.1)
therubyracer (~> 0.12.3)
tzinfo (~> 1.2.3)
Expand All @@ -35,43 +34,43 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
actioncable (5.2.0.rc2)
actionpack (= 5.2.0.rc2)
actioncable (5.2.0)
actionpack (= 5.2.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.0.rc2)
actionpack (= 5.2.0.rc2)
actionview (= 5.2.0.rc2)
activejob (= 5.2.0.rc2)
actionmailer (5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.0.rc2)
actionview (= 5.2.0.rc2)
activesupport (= 5.2.0.rc2)
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.0.rc2)
activesupport (= 5.2.0.rc2)
actionview (5.2.0)
activesupport (= 5.2.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.0.rc2)
activesupport (= 5.2.0.rc2)
activejob (5.2.0)
activesupport (= 5.2.0)
globalid (>= 0.3.6)
activemodel (5.2.0.rc2)
activesupport (= 5.2.0.rc2)
activerecord (5.2.0.rc2)
activemodel (= 5.2.0.rc2)
activesupport (= 5.2.0.rc2)
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
arel (>= 9.0)
activestorage (5.2.0.rc2)
actionpack (= 5.2.0.rc2)
activerecord (= 5.2.0.rc2)
activestorage (5.2.0)
actionpack (= 5.2.0)
activerecord (= 5.2.0)
marcel (~> 0.3.1)
activesupport (5.2.0.rc2)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -98,8 +97,8 @@ GEM
orm_adapter (~> 0.5.0)
climate_control (0.2.0)
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
cocaine (0.6.0)
terrapin (= 0.6.0)
codeclimate-test-reporter (1.0.8)
simplecov (<= 0.13)
coderay (1.1.2)
Expand All @@ -120,10 +119,10 @@ GEM
sass-rails (< 5.1)
sprockets (< 4.0)
concurrent-ruby (1.0.5)
crass (1.0.3)
crass (1.0.4)
css_parser (1.6.0)
addressable
database_cleaner (1.6.2)
database_cleaner (1.7.0)
delocalize (0.4.0)
rails (>= 3.0)
diff-lcs (1.3)
Expand Down Expand Up @@ -156,7 +155,7 @@ GEM
ruby_parser (~> 3.5)
httparty (0.16.2)
multi_xml (>= 0.5.2)
i18n (1.0.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
json (2.1.0)
kraken-io (0.1.3)
Expand Down Expand Up @@ -185,7 +184,7 @@ GEM
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mysql2 (0.4.10)
mysql2 (0.5.1)
nio4r (2.3.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
Expand All @@ -207,24 +206,24 @@ GEM
byebug (~> 10.0)
pry (~> 0.10)
public_suffix (3.0.2)
rack (2.0.4)
rack (2.0.5)
rack-cache (1.7.1)
rack (>= 0.4)
rack-test (1.0.0)
rack (>= 1.0, < 3)
radius (0.7.4)
rails (5.2.0.rc2)
actioncable (= 5.2.0.rc2)
actionmailer (= 5.2.0.rc2)
actionpack (= 5.2.0.rc2)
actionview (= 5.2.0.rc2)
activejob (= 5.2.0.rc2)
activemodel (= 5.2.0.rc2)
activerecord (= 5.2.0.rc2)
activestorage (= 5.2.0.rc2)
activesupport (= 5.2.0.rc2)
rails (5.2.0)
actioncable (= 5.2.0)
actionmailer (= 5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
activemodel (= 5.2.0)
activerecord (= 5.2.0)
activestorage (= 5.2.0)
activesupport (= 5.2.0)
bundler (>= 1.3.0)
railties (= 5.2.0.rc2)
railties (= 5.2.0)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
Expand All @@ -233,9 +232,9 @@ GEM
loofah (~> 2.2, >= 2.2.2)
rails-observers (0.1.5)
activemodel (>= 4.0)
railties (5.2.0.rc2)
actionpack (= 5.2.0.rc2)
activesupport (= 5.2.0.rc2)
railties (5.2.0)
actionpack (= 5.2.0)
activesupport (= 5.2.0)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
Expand All @@ -245,11 +244,11 @@ GEM
ffi (>= 0.5.0, < 2)
rdoc (5.1.0)
ref (2.0.0)
roadie (3.2.2)
roadie (3.3.0)
css_parser (~> 1.4)
nokogiri (~> 1.5)
roadie-rails (1.2.1)
railties (>= 3.0, < 5.2)
roadie-rails (1.3.0)
railties (>= 3.0, < 5.3)
roadie (~> 3.1)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
Expand Down Expand Up @@ -277,7 +276,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sexp_processor (4.10.1)
sexp_processor (4.11.0)
simplecov (0.13.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -319,12 +318,11 @@ PLATFORMS

DEPENDENCIES
acts_as_list
cocaine
codeclimate-test-reporter
database_cleaner
factory_bot_rails
launchy (~> 2.4.2)
mysql2 (~> 0.4.2)
mysql2
poltergeist (~> 1.14.0)
pry-byebug
rails-observers
Expand Down
7 changes: 3 additions & 4 deletions trusty_cms.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ a general purpose content managment system--not merely a blogging engine.}
s.add_dependency 'acts_as_list', '~> 0.9.5'
s.add_dependency 'acts_as_tree', '~> 2.6.1'
s.add_dependency 'bundler', '~> 1.7'
s.add_dependency 'cocaine', '~> 0.5.8'
s.add_dependency 'ckeditor', '~> 4.2.2'
s.add_dependency 'compass-rails', '~> 3.0.2'
s.add_dependency 'delocalize', '~> 0.2'
Expand All @@ -36,16 +35,16 @@ a general purpose content managment system--not merely a blogging engine.}
s.add_dependency 'haml-rails', '~> 1.0.0'
s.add_dependency 'highline', '~> 1.7.8'
s.add_dependency 'kraken-io'
s.add_dependency 'mysql2', '~> 0.4.2'
s.add_dependency 'mysql2'
s.add_dependency 'paperclip', '> 5.2'
s.add_dependency 'rack', '~> 2.0.1'
s.add_dependency 'rack-cache', '~> 1.7'
s.add_dependency 'rails', '~> 5.2.0.rc2'
s.add_dependency 'rails', '~> 5.2.0'
s.add_dependency 'rdoc', '~> 5.1'
s.add_dependency 'radius', '~> 0.7'
s.add_dependency 'RedCloth', '4.3.2'
s.add_dependency 'rake', '< 11.0'
s.add_dependency 'roadie-rails', '~> 1.2.1'
s.add_dependency 'roadie-rails'
s.add_dependency 'stringex', '~> 2.7.1'
s.add_dependency 'therubyracer', '~> 0.12.3'
s.add_dependency 'tzinfo', '~> 1.2.3'
Expand Down

0 comments on commit 7168909

Please sign in to comment.