mirror of
https://github.com/jcwimer/wrestlingApp
synced 2026-04-09 07:39:06 +00:00
Upgraded to rails 4.2.5
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -1,7 +1,7 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||||
gem 'rails', '4.2.0'
|
gem 'rails', '4.2.5'
|
||||||
# Use sqlite3 as the database for Active Record
|
# Use sqlite3 as the database for Active Record
|
||||||
gem 'sqlite3', :group => :development
|
gem 'sqlite3', :group => :development
|
||||||
|
|
||||||
|
|||||||
99
Gemfile.lock
99
Gemfile.lock
@@ -1,42 +1,42 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.0)
|
actionmailer (4.2.5)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.5)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.5)
|
||||||
activejob (= 4.2.0)
|
activejob (= 4.2.5)
|
||||||
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.0)
|
actionpack (4.2.5)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.5)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5)
|
||||||
rack (~> 1.6.0)
|
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.1)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.0)
|
actionview (4.2.5)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5)
|
||||||
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.1)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
activejob (4.2.0)
|
activejob (4.2.5)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.0)
|
activemodel (4.2.5)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.0)
|
activerecord (4.2.5)
|
||||||
activemodel (= 4.2.0)
|
activemodel (= 4.2.5)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activesupport (4.2.0)
|
activesupport (4.2.5)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
arel (6.0.0)
|
arel (6.0.3)
|
||||||
bcrypt (3.1.10)
|
bcrypt (3.1.10)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
cancancan (1.10.1)
|
cancancan (1.10.1)
|
||||||
@@ -47,6 +47,7 @@ GEM
|
|||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.9.1.1)
|
coffee-script-source (1.9.1.1)
|
||||||
|
concurrent-ruby (1.0.0)
|
||||||
devise (3.4.1)
|
devise (3.4.1)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
@@ -56,7 +57,7 @@ GEM
|
|||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.5.2)
|
execjs (2.5.2)
|
||||||
globalid (0.3.5)
|
globalid (0.3.6)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
jbuilder (2.2.13)
|
jbuilder (2.2.13)
|
||||||
@@ -66,43 +67,43 @@ GEM
|
|||||||
rails-dom-testing (~> 1.0)
|
rails-dom-testing (~> 1.0)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.2)
|
json (1.8.3)
|
||||||
libv8 (3.16.14.7)
|
libv8 (3.16.14.7)
|
||||||
loofah (2.0.1)
|
loofah (2.0.3)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.6.3)
|
mail (2.6.3)
|
||||||
mime-types (>= 1.16, < 3)
|
mime-types (>= 1.16, < 3)
|
||||||
mime-types (2.5)
|
mime-types (2.99)
|
||||||
mini_portile (0.6.2)
|
mini_portile2 (2.0.0)
|
||||||
minitest (5.6.1)
|
minitest (5.8.3)
|
||||||
multi_json (1.11.0)
|
multi_json (1.11.0)
|
||||||
mysql2 (0.3.18)
|
mysql2 (0.3.18)
|
||||||
newrelic_rpm (3.13.2.302)
|
newrelic_rpm (3.13.2.302)
|
||||||
nokogiri (1.6.6.2)
|
nokogiri (1.6.7)
|
||||||
mini_portile (~> 0.6.0)
|
mini_portile2 (~> 2.0.0.rc2)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
passenger (5.0.7)
|
passenger (5.0.7)
|
||||||
rack
|
rack
|
||||||
rake (>= 0.8.1)
|
rake (>= 0.8.1)
|
||||||
puma (2.11.2)
|
puma (2.11.2)
|
||||||
rack (>= 1.1, < 2.0)
|
rack (>= 1.1, < 2.0)
|
||||||
rack (1.6.0)
|
rack (1.6.4)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.0)
|
rails (4.2.5)
|
||||||
actionmailer (= 4.2.0)
|
actionmailer (= 4.2.5)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.5)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.5)
|
||||||
activejob (= 4.2.0)
|
activejob (= 4.2.5)
|
||||||
activemodel (= 4.2.0)
|
activemodel (= 4.2.5)
|
||||||
activerecord (= 4.2.0)
|
activerecord (= 4.2.5)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.0)
|
railties (= 4.2.5)
|
||||||
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)
|
||||||
rails-dom-testing (1.0.6)
|
rails-dom-testing (1.0.7)
|
||||||
activesupport (>= 4.2.0.beta, < 5.0)
|
activesupport (>= 4.2.0.beta, < 5.0)
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
@@ -113,9 +114,9 @@ GEM
|
|||||||
rails_stdout_logging
|
rails_stdout_logging
|
||||||
rails_serve_static_assets (0.0.4)
|
rails_serve_static_assets (0.0.4)
|
||||||
rails_stdout_logging (0.0.3)
|
rails_stdout_logging (0.0.3)
|
||||||
railties (4.2.0)
|
railties (4.2.5)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.5)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.4.2)
|
rake (10.4.2)
|
||||||
@@ -130,9 +131,10 @@ GEM
|
|||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
spring (1.3.5)
|
spring (1.3.5)
|
||||||
sprockets (3.0.3)
|
sprockets (3.5.0)
|
||||||
rack (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
sprockets-rails (2.2.4)
|
rack (> 1, < 3)
|
||||||
|
sprockets-rails (2.3.3)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
@@ -165,7 +167,7 @@ DEPENDENCIES
|
|||||||
newrelic_rpm
|
newrelic_rpm
|
||||||
passenger
|
passenger
|
||||||
puma
|
puma
|
||||||
rails (= 4.2.0)
|
rails (= 4.2.5)
|
||||||
rails_12factor
|
rails_12factor
|
||||||
rb-readline
|
rb-readline
|
||||||
round_robin_tournament
|
round_robin_tournament
|
||||||
@@ -175,3 +177,6 @@ DEPENDENCIES
|
|||||||
therubyracer
|
therubyracer
|
||||||
turbolinks
|
turbolinks
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
1.10.6
|
||||||
|
|||||||
Reference in New Issue
Block a user