Merge pull request #249 from jasnow/master
Upgraded 21+ gems including Rails 4.2.7 upgrade
This commit is contained in:
Ken Johnson
@@ -1,7 +1,7 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
#don't upgrade
|
#don't upgrade
|
||||||
gem 'rails', '4.2.6'
|
gem 'rails', '4.2.7'
|
||||||
|
|
||||||
ruby '2.3.1'
|
ruby '2.3.1'
|
||||||
|
|
||||||
|
|||||||
+79
-77
@@ -1,36 +1,36 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.6)
|
actionmailer (4.2.7)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 4.2.7)
|
||||||
actionview (= 4.2.6)
|
actionview (= 4.2.7)
|
||||||
activejob (= 4.2.6)
|
activejob (= 4.2.7)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
actionpack (4.2.6)
|
actionpack (4.2.7)
|
||||||
actionview (= 4.2.6)
|
actionview (= 4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
rack (~> 1.6)
|
rack (~> 1.6)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.6)
|
actionview (4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
activejob (4.2.6)
|
activejob (4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.6)
|
activemodel (4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.6)
|
activerecord (4.2.7)
|
||||||
activemodel (= 4.2.6)
|
activemodel (= 4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activesupport (4.2.6)
|
activesupport (4.2.7)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
@@ -52,7 +52,7 @@ GEM
|
|||||||
rack (>= 0.9.0)
|
rack (>= 0.9.0)
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
brakeman (3.3.1)
|
brakeman (3.3.3)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
bundler-audit (0.5.0)
|
bundler-audit (0.5.0)
|
||||||
bundler (~> 1.2)
|
bundler (~> 1.2)
|
||||||
@@ -68,9 +68,9 @@ GEM
|
|||||||
ffi (~> 1.0, >= 1.0.11)
|
ffi (~> 1.0, >= 1.0.11)
|
||||||
cliver (0.3.2)
|
cliver (0.3.2)
|
||||||
coderay (1.1.1)
|
coderay (1.1.1)
|
||||||
coffee-rails (4.1.1)
|
coffee-rails (4.2.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (>= 4.0.0, < 5.1.x)
|
railties (>= 4.0.0, < 5.2.x)
|
||||||
coffee-script (2.4.1)
|
coffee-script (2.4.1)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
@@ -78,16 +78,16 @@ GEM
|
|||||||
concurrent-ruby (1.0.2)
|
concurrent-ruby (1.0.2)
|
||||||
contracts (0.14.0)
|
contracts (0.14.0)
|
||||||
crack (0.3.1)
|
crack (0.3.1)
|
||||||
cucumber (2.3.3)
|
cucumber (2.4.0)
|
||||||
builder (>= 2.1.2)
|
builder (>= 2.1.2)
|
||||||
cucumber-core (~> 1.4.0)
|
cucumber-core (~> 1.5.0)
|
||||||
cucumber-wire (~> 0.0.1)
|
cucumber-wire (~> 0.0.1)
|
||||||
diff-lcs (>= 1.1.3)
|
diff-lcs (>= 1.1.3)
|
||||||
gherkin (~> 3.2.0)
|
gherkin (~> 4.0)
|
||||||
multi_json (>= 1.7.5, < 2.0)
|
multi_json (>= 1.7.5, < 2.0)
|
||||||
multi_test (>= 0.1.2)
|
multi_test (>= 0.1.2)
|
||||||
cucumber-core (1.4.0)
|
cucumber-core (1.5.0)
|
||||||
gherkin (~> 3.2.0)
|
gherkin (~> 4.0)
|
||||||
cucumber-wire (0.0.1)
|
cucumber-wire (0.0.1)
|
||||||
daemons (1.2.3)
|
daemons (1.2.3)
|
||||||
database_cleaner (1.5.3)
|
database_cleaner (1.5.3)
|
||||||
@@ -100,12 +100,12 @@ GEM
|
|||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.9.1)
|
eventmachine (1.0.9.1)
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
ffi (1.9.10)
|
ffi (1.9.14)
|
||||||
foreman (0.82.0)
|
foreman (0.82.0)
|
||||||
thor (~> 0.19.1)
|
thor (~> 0.19.1)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
gherkin (3.2.0)
|
gherkin (4.0.0)
|
||||||
globalid (0.3.6)
|
globalid (0.3.7)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
guard (2.14.0)
|
guard (2.14.0)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
@@ -134,7 +134,7 @@ GEM
|
|||||||
guard-compat (~> 1.0)
|
guard-compat (~> 1.0)
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
jquery-fileupload-rails (0.4.6)
|
jquery-fileupload-rails (0.4.7)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
sass (>= 3.2)
|
sass (>= 3.2)
|
||||||
@@ -169,26 +169,27 @@ GEM
|
|||||||
mime-types (3.1)
|
mime-types (3.1)
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2016.0521)
|
mime-types-data (3.2016.0521)
|
||||||
mini_portile2 (2.0.0)
|
mini_portile2 (2.1.0)
|
||||||
minitest (5.9.0)
|
minitest (5.9.0)
|
||||||
multi_json (1.12.1)
|
multi_json (1.12.1)
|
||||||
multi_test (0.1.2)
|
multi_test (0.1.2)
|
||||||
mysql2 (0.4.4)
|
mysql2 (0.4.4)
|
||||||
nenv (0.3.0)
|
nenv (0.3.0)
|
||||||
nokogiri (1.6.7.2)
|
nokogiri (1.6.8)
|
||||||
mini_portile2 (~> 2.0.0.rc2)
|
mini_portile2 (~> 2.1.0)
|
||||||
|
pkg-config (~> 1.1.7)
|
||||||
notiffany (0.1.0)
|
notiffany (0.1.0)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
shellany (~> 0.0)
|
shellany (~> 0.0)
|
||||||
poltergeist (1.9.0)
|
pkg-config (1.1.7)
|
||||||
|
poltergeist (1.10.0)
|
||||||
capybara (~> 2.1)
|
capybara (~> 2.1)
|
||||||
cliver (~> 0.3.1)
|
cliver (~> 0.3.1)
|
||||||
multi_json (~> 1.0)
|
|
||||||
websocket-driver (>= 0.2.0)
|
websocket-driver (>= 0.2.0)
|
||||||
powder (0.3.0)
|
powder (0.3.0)
|
||||||
thor (>= 0.11.5)
|
thor (>= 0.11.5)
|
||||||
power_assert (0.3.0)
|
power_assert (0.3.0)
|
||||||
pry (0.10.3)
|
pry (0.10.4)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.8.1)
|
method_source (~> 0.8.1)
|
||||||
slop (~> 3.4)
|
slop (~> 3.4)
|
||||||
@@ -201,16 +202,16 @@ GEM
|
|||||||
rack
|
rack
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.6)
|
rails (4.2.7)
|
||||||
actionmailer (= 4.2.6)
|
actionmailer (= 4.2.7)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 4.2.7)
|
||||||
actionview (= 4.2.6)
|
actionview (= 4.2.7)
|
||||||
activejob (= 4.2.6)
|
activejob (= 4.2.7)
|
||||||
activemodel (= 4.2.6)
|
activemodel (= 4.2.7)
|
||||||
activerecord (= 4.2.6)
|
activerecord (= 4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.6)
|
railties (= 4.2.7)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
@@ -220,52 +221,52 @@ GEM
|
|||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
rails-html-sanitizer (1.0.3)
|
rails-html-sanitizer (1.0.3)
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
railties (4.2.6)
|
railties (4.2.7)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.16.0)
|
raindrops (0.16.0)
|
||||||
rake (11.1.2)
|
rake (11.2.2)
|
||||||
rb-fsevent (0.9.7)
|
rb-fsevent (0.9.7)
|
||||||
rb-inotify (0.9.7)
|
rb-inotify (0.9.7)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
ref (2.0.0)
|
ref (2.0.0)
|
||||||
responders (2.2.0)
|
responders (2.2.0)
|
||||||
railties (>= 4.2.0, < 5.1)
|
railties (>= 4.2.0, < 5.1)
|
||||||
rspec (3.4.0)
|
rspec (3.5.0)
|
||||||
rspec-core (~> 3.4.0)
|
rspec-core (~> 3.5.0)
|
||||||
rspec-expectations (~> 3.4.0)
|
rspec-expectations (~> 3.5.0)
|
||||||
rspec-mocks (~> 3.4.0)
|
rspec-mocks (~> 3.5.0)
|
||||||
rspec-core (3.4.4)
|
rspec-core (3.5.2)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.5.0)
|
||||||
rspec-expectations (3.4.0)
|
rspec-expectations (3.5.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.5.0)
|
||||||
rspec-mocks (3.4.1)
|
rspec-mocks (3.5.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.5.0)
|
||||||
rspec-rails (3.4.2)
|
rspec-rails (3.5.1)
|
||||||
actionpack (>= 3.0, < 4.3)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0, < 4.3)
|
activesupport (>= 3.0)
|
||||||
railties (>= 3.0, < 4.3)
|
railties (>= 3.0)
|
||||||
rspec-core (~> 3.4.0)
|
rspec-core (~> 3.5.0)
|
||||||
rspec-expectations (~> 3.4.0)
|
rspec-expectations (~> 3.5.0)
|
||||||
rspec-mocks (~> 3.4.0)
|
rspec-mocks (~> 3.5.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.5.0)
|
||||||
rspec-support (3.4.1)
|
rspec-support (3.5.0)
|
||||||
ruby_dep (1.3.1)
|
ruby_dep (1.3.1)
|
||||||
sass (3.4.22)
|
sass (3.4.22)
|
||||||
sass-rails (5.0.4)
|
sass-rails (5.0.6)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 6)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sprockets-rails (>= 2.0, < 4.0)
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
tilt (>= 1.1, < 3)
|
tilt (>= 1.1, < 3)
|
||||||
shellany (0.0.1)
|
shellany (0.0.1)
|
||||||
simplecov (0.11.2)
|
simplecov (0.12.0)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
json (~> 1.8)
|
json (>= 1.8, < 3)
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
simplecov-html (0.10.0)
|
simplecov-html (0.10.0)
|
||||||
sinatra (1.4.7)
|
sinatra (1.4.7)
|
||||||
@@ -276,15 +277,15 @@ GEM
|
|||||||
eventmachine (~> 1.0.0)
|
eventmachine (~> 1.0.0)
|
||||||
thin (>= 1.5, < 1.7)
|
thin (>= 1.5, < 1.7)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
sprockets (3.6.0)
|
sprockets (3.7.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
sprockets-rails (3.0.4)
|
sprockets-rails (3.1.1)
|
||||||
actionpack (>= 4.0)
|
actionpack (>= 4.0)
|
||||||
activesupport (>= 4.0)
|
activesupport (>= 4.0)
|
||||||
sprockets (>= 3.0.0)
|
sprockets (>= 3.0.0)
|
||||||
sqlite3 (1.3.11)
|
sqlite3 (1.3.11)
|
||||||
test-unit (3.1.9)
|
test-unit (3.2.1)
|
||||||
power_assert
|
power_assert
|
||||||
therubyracer (0.12.2)
|
therubyracer (0.12.2)
|
||||||
libv8 (~> 3.16.14.0)
|
libv8 (~> 3.16.14.0)
|
||||||
@@ -298,8 +299,9 @@ GEM
|
|||||||
tilt (2.0.5)
|
tilt (2.0.5)
|
||||||
travis-lint (2.0.0)
|
travis-lint (2.0.0)
|
||||||
json
|
json
|
||||||
turbolinks (2.5.3)
|
turbolinks (5.0.0)
|
||||||
coffee-rails
|
turbolinks-source (~> 5)
|
||||||
|
turbolinks-source (5.0.0)
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (3.0.0)
|
uglifier (3.0.0)
|
||||||
@@ -343,7 +345,7 @@ DEPENDENCIES
|
|||||||
pry
|
pry
|
||||||
pry-rails
|
pry-rails
|
||||||
rack-livereload
|
rack-livereload
|
||||||
rails (= 4.2.6)
|
rails (= 4.2.7)
|
||||||
rake
|
rake
|
||||||
rb-fsevent
|
rb-fsevent
|
||||||
responders
|
responders
|
||||||
|
|||||||
Reference in New Issue
Block a user