mirror of
https://github.com/TracksApp/tracks.git
synced 2025-09-21 21:40:48 +02:00
Initial gem update to Rails 5.x
Co-Authored-By: Dan Rice <dnrce@users.noreply.github.com>
This commit is contained in:
Matt Rogers
parent
1d9c947705
commit
57ae87cccb
2 changed files with 96 additions and 87 deletions
18
Gemfile
18
Gemfile
|
|
@ -1,20 +1,21 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '~> 4.2.10'
|
||||
gem 'rails', '~> 5.0.0'
|
||||
gem 'sass-rails', '~> 5.0'
|
||||
gem 'coffee-rails', '~> 4.1.0'
|
||||
gem 'coffee-rails', '~> 4.2.0'
|
||||
|
||||
#gem 'json'
|
||||
|
||||
# todo: remove xml api
|
||||
gem 'actionpack-xml_parser', '>=1.0.1'
|
||||
gem "actionpack-xml_parser", "~> 2.0"
|
||||
gem "activemodel-serializers-xml", "~> 1.0.1"
|
||||
|
||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
||||
gem 'therubyracer', group: :therubyracer
|
||||
|
||||
gem 'uglifier', '>=1.3.0'
|
||||
|
||||
gem 'jquery-rails' , '~> 3.1.3'
|
||||
gem 'jquery-rails' , '~> 4.0'
|
||||
gem 'jquery-ui-rails' , '~>5.0.5'
|
||||
|
||||
# you may comment out the database driver(s) you will not be using.
|
||||
|
|
@ -51,7 +52,7 @@ group :development do
|
|||
gem "spring"
|
||||
gem "yard"
|
||||
|
||||
gem 'tolk', '~> 1.9.3'
|
||||
gem 'tolk', '~> 2.0.0'
|
||||
|
||||
gem "bullet"
|
||||
gem "rack-mini-profiler"
|
||||
|
|
@ -59,14 +60,13 @@ group :development do
|
|||
end
|
||||
|
||||
group :development, :test do
|
||||
gem 'pry'
|
||||
gem 'byebug'
|
||||
gem "rubocop", "~> 0.49", require: false
|
||||
end
|
||||
|
||||
group :test do
|
||||
# Pull in the fix for rails-dom-testing issue #42
|
||||
# TODO: Remove with Rails 5 and rails-dom-testing 2.x
|
||||
gem 'rails-dom-testing', git: 'https://github.com/rails/rails-dom-testing', ref: 'a64f30514ee65f172c43f42cfd4500b5e11a561a'
|
||||
gem 'rails-controller-testing'
|
||||
gem 'rails-dom-testing', '~> 2.0.0'
|
||||
|
||||
|
||||
gem "factory_bot_rails"
|
||||
|
|
|
|||
165
Gemfile.lock
165
Gemfile.lock
|
|
@ -1,57 +1,55 @@
|
|||
GIT
|
||||
remote: https://github.com/rails/rails-dom-testing
|
||||
revision: a64f30514ee65f172c43f42cfd4500b5e11a561a
|
||||
ref: a64f30514ee65f172c43f42cfd4500b5e11a561a
|
||||
specs:
|
||||
rails-dom-testing (1.0.7)
|
||||
activesupport (>= 4.2.0.beta, < 5.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
RedCloth (4.3.2)
|
||||
aasm (3.4.0)
|
||||
actionmailer (4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activejob (= 4.2.10)
|
||||
actioncable (5.0.7)
|
||||
actionpack (= 5.0.7)
|
||||
nio4r (>= 1.2, < 3.0)
|
||||
websocket-driver (~> 0.6.1)
|
||||
actionmailer (5.0.7)
|
||||
actionpack (= 5.0.7)
|
||||
actionview (= 5.0.7)
|
||||
activejob (= 5.0.7)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
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)
|
||||
actionview (= 5.0.7)
|
||||
activesupport (= 5.0.7)
|
||||
rack (~> 2.0)
|
||||
rack-test (~> 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionpack-xml_parser (1.0.2)
|
||||
actionpack (>= 4.0.0, < 5)
|
||||
actionview (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
actionpack-xml_parser (2.0.1)
|
||||
actionpack (>= 5.0)
|
||||
railties (>= 5.0)
|
||||
actionview (5.0.7)
|
||||
activesupport (= 5.0.7)
|
||||
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.10)
|
||||
activesupport (= 4.2.10)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
activejob (5.0.7)
|
||||
activesupport (= 5.0.7)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (5.0.7)
|
||||
activesupport (= 5.0.7)
|
||||
activemodel-serializers-xml (1.0.2)
|
||||
activemodel (> 5.x)
|
||||
activesupport (> 5.x)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.10)
|
||||
activemodel (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.10)
|
||||
i18n (~> 0.7)
|
||||
activerecord (5.0.7)
|
||||
activemodel (= 5.0.7)
|
||||
activesupport (= 5.0.7)
|
||||
arel (~> 7.0)
|
||||
activesupport (5.0.7)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
acts_as_list (0.9.15)
|
||||
activerecord (>= 3.0)
|
||||
arel (6.0.4)
|
||||
arel (7.1.4)
|
||||
ast (2.4.0)
|
||||
autoprefixer-rails (8.6.5)
|
||||
execjs
|
||||
|
|
@ -63,15 +61,15 @@ GEM
|
|||
bullet (5.7.5)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.11.0)
|
||||
byebug (10.0.2)
|
||||
childprocess (0.9.0)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
climate_control (0.2.0)
|
||||
codeclimate-test-reporter (1.0.7)
|
||||
simplecov
|
||||
coderay (1.1.2)
|
||||
coffee-rails (4.1.1)
|
||||
coffee-rails (4.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.1.x)
|
||||
railties (>= 4.0.0)
|
||||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
|
|
@ -96,11 +94,12 @@ GEM
|
|||
globalid (0.4.1)
|
||||
activesupport (>= 4.2.0)
|
||||
htmlentities (4.3.4)
|
||||
i18n (0.9.5)
|
||||
i18n (1.1.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jaro_winkler (1.5.1)
|
||||
jquery-rails (3.1.5)
|
||||
railties (>= 3.0, < 5.0)
|
||||
jquery-rails (4.3.3)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
|
|
@ -117,15 +116,16 @@ GEM
|
|||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mimemagic (0.3.2)
|
||||
mini_mime (1.0.0)
|
||||
mini_portile2 (2.1.0)
|
||||
mini_mime (1.0.1)
|
||||
mini_portile2 (2.3.0)
|
||||
minitest (5.11.3)
|
||||
minitest-stub-const (0.6)
|
||||
mocha (1.6.0)
|
||||
metaclass (~> 0.0.1)
|
||||
mysql2 (0.3.21)
|
||||
nokogiri (1.6.8.1)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
nio4r (2.3.1)
|
||||
nokogiri (1.8.4)
|
||||
mini_portile2 (~> 2.3.0)
|
||||
nokogumbo (1.5.0)
|
||||
nokogiri
|
||||
paperclip (6.1.0)
|
||||
|
|
@ -138,36 +138,40 @@ GEM
|
|||
parser (2.5.1.2)
|
||||
ast (~> 2.4.0)
|
||||
powerpack (0.1.2)
|
||||
pry (0.11.3)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.9.0)
|
||||
rack (1.6.10)
|
||||
rack (2.0.5)
|
||||
rack-dev-mark (0.7.7)
|
||||
rack (>= 1.1, < 2.1)
|
||||
rack-mini-profiler (1.0.0)
|
||||
rack (>= 1.2.0)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.10)
|
||||
actionmailer (= 4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activejob (= 4.2.10)
|
||||
activemodel (= 4.2.10)
|
||||
activerecord (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.10)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails (5.0.7)
|
||||
actioncable (= 5.0.7)
|
||||
actionmailer (= 5.0.7)
|
||||
actionpack (= 5.0.7)
|
||||
actionview (= 5.0.7)
|
||||
activejob (= 5.0.7)
|
||||
activemodel (= 5.0.7)
|
||||
activerecord (= 5.0.7)
|
||||
activesupport (= 5.0.7)
|
||||
bundler (>= 1.3.0)
|
||||
railties (= 5.0.7)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-controller-testing (1.0.2)
|
||||
actionpack (~> 5.x, >= 5.0.1)
|
||||
actionview (~> 5.x, >= 5.0.1)
|
||||
activesupport (~> 5.x)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.0.4)
|
||||
loofah (~> 2.2, >= 2.2.2)
|
||||
rails_autolink (1.1.6)
|
||||
rails (> 3.1)
|
||||
railties (4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
railties (5.0.7)
|
||||
actionpack (= 5.0.7)
|
||||
activesupport (= 5.0.7)
|
||||
method_source
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (3.0.0)
|
||||
|
|
@ -240,8 +244,8 @@ GEM
|
|||
thor (0.20.0)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.8)
|
||||
tolk (1.9.3)
|
||||
rails (>= 4.0, < 4.3)
|
||||
tolk (2.0.0)
|
||||
rails (>= 4.0)
|
||||
safe_yaml (>= 0.8.6)
|
||||
tzinfo (1.2.5)
|
||||
thread_safe (~> 0.1)
|
||||
|
|
@ -250,6 +254,9 @@ GEM
|
|||
unicode-display_width (1.4.0)
|
||||
uniform_notifier (1.11.0)
|
||||
websocket (1.2.8)
|
||||
websocket-driver (0.6.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.3)
|
||||
will_paginate (3.1.6)
|
||||
yard (0.9.15)
|
||||
|
||||
|
|
@ -259,28 +266,30 @@ PLATFORMS
|
|||
DEPENDENCIES
|
||||
RedCloth
|
||||
aasm (~> 3.4.0)
|
||||
actionpack-xml_parser (>= 1.0.1)
|
||||
actionpack-xml_parser (~> 2.0)
|
||||
activemodel-serializers-xml (~> 1.0.1)
|
||||
acts_as_list
|
||||
bcrypt (~> 3.1.7)
|
||||
bootstrap-sass (= 3.3.3)
|
||||
bullet
|
||||
byebug
|
||||
codeclimate-test-reporter (= 1.0.7)
|
||||
coffee-rails (~> 4.1.0)
|
||||
coffee-rails (~> 4.2.0)
|
||||
database_cleaner
|
||||
factory_bot_rails
|
||||
font-awesome-sass (~> 4.5.0)
|
||||
htmlentities
|
||||
jquery-rails (~> 3.1.3)
|
||||
jquery-rails (~> 4.0)
|
||||
jquery-ui-rails (~> 5.0.5)
|
||||
minitest-stub-const
|
||||
mocha
|
||||
mysql2 (~> 0.3.17)
|
||||
paperclip
|
||||
pry
|
||||
rack-dev-mark
|
||||
rack-mini-profiler
|
||||
rails (~> 4.2.10)
|
||||
rails-dom-testing!
|
||||
rails (~> 5.0.0)
|
||||
rails-controller-testing
|
||||
rails-dom-testing (~> 2.0.0)
|
||||
rails_autolink
|
||||
rspec-expectations
|
||||
rubocop (~> 0.49)
|
||||
|
|
@ -293,7 +302,7 @@ DEPENDENCIES
|
|||
swf_fu
|
||||
therubyracer
|
||||
thin
|
||||
tolk (~> 1.9.3)
|
||||
tolk (~> 2.0.0)
|
||||
uglifier (>= 1.3.0)
|
||||
will_paginate
|
||||
yard
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue