cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-18 21:42:16 +00:00
Code Issues Releases Wiki Activity

Updated to rails 4.2.0

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-02-09 10:34:12 -05:00
parent 7f692cc925
commit 66c6840716
2 changed files with 69 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -2,7 +2,7 @@ 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.1.4' gem 'rails', '4.2.0'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
gem 'sqlite3', :group => :development gem 'sqlite3', :group => :development
# Use SCSS for stylesheets # Use SCSS for stylesheets

115
Gemfile.lock
View File

@@ -1,33 +1,42 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.4) actionmailer (4.2.0)
actionpack (= 4.1.4) actionpack (= 4.2.0)
actionview (= 4.1.4) actionview (= 4.2.0)
mail (~> 2.5.4) activejob (= 4.2.0)
actionpack (4.1.4) mail (~> 2.5, >= 2.5.4)
actionview (= 4.1.4) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.4) actionpack (4.2.0)
rack (~> 1.5.2) actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.4) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.4) rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.4) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.4) rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0)
activesupport (= 4.2.0)
globalid (>= 0.3.0)
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.4) activerecord (4.2.0)
activemodel (= 4.1.4) activemodel (= 4.2.0)
activesupport (= 4.1.4) activesupport (= 4.2.0)
arel (~> 5.0.0) arel (~> 6.0)
activesupport (4.1.4) activesupport (4.2.0)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.1) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (5.0.1.20140414130214) arel (6.0.0)
bcrypt (3.1.10) bcrypt (3.1.10)
bootstrap-sass (2.3.2.0) bootstrap-sass (2.3.2.0)
sass (~> 3.2) sass (~> 3.2)
@@ -54,53 +63,68 @@ GEM
warden (~> 1.2.3) warden (~> 1.2.3)
erubis (2.7.0) erubis (2.7.0)
execjs (2.3.0) execjs (2.3.0)
globalid (0.3.2)
activesupport (>= 4.1.0)
hike (1.2.3) hike (1.2.3)
i18n (0.7.0) i18n (0.7.0)
jbuilder (2.2.6) jbuilder (2.2.6)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (3.1.2) jquery-rails (4.0.3)
railties (>= 3.0, < 5.0) rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.2) json (1.8.2)
mail (2.5.4) loofah (2.0.1)
mime-types (~> 1.16) nokogiri (>= 1.5.9)
treetop (~> 1.4.8) mail (2.6.3)
mime-types (1.25.1) mime-types (>= 1.16, < 3)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.5.1) minitest (5.5.1)
multi_json (1.10.1) multi_json (1.10.1)
mysql2 (0.3.17) mysql2 (0.3.17)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
pg (0.18.1) pg (0.18.1)
polyglot (0.3.5) rack (1.6.0)
rack (1.5.2)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.4) rails (4.2.0)
actionmailer (= 4.1.4) actionmailer (= 4.2.0)
actionpack (= 4.1.4) actionpack (= 4.2.0)
actionview (= 4.1.4) actionview (= 4.2.0)
activemodel (= 4.1.4) activejob (= 4.2.0)
activerecord (= 4.1.4) activemodel (= 4.2.0)
activesupport (= 4.1.4) activerecord (= 4.2.0)
activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4) railties (= 4.2.0)
sprockets-rails (~> 2.0) sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.5)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
rails_12factor (0.0.3) rails_12factor (0.0.3)
rails_serve_static_assets rails_serve_static_assets
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.1.4) railties (4.2.0)
actionpack (= 4.1.4) actionpack (= 4.2.0)
activesupport (= 4.1.4) activesupport (= 4.2.0)
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)
rb-readline (0.5.2) rb-readline (0.5.2)
rdoc (4.2.0) rdoc (4.2.0)
responders (1.1.2) responders (2.1.0)
railties (>= 3.2, < 4.2) railties (>= 4.2.0, < 5)
round_robin_tournament (0.0.1) round_robin_tournament (0.0.1)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.5) sass-rails (4.0.5)
@@ -111,7 +135,7 @@ GEM
sdoc (0.4.1) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
spring (1.2.0) spring (1.3.0)
sprockets (2.12.3) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
@@ -125,9 +149,6 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (2.5.3) turbolinks (2.5.3)
coffee-rails coffee-rails
tzinfo (1.2.2) tzinfo (1.2.2)
@@ -151,7 +172,7 @@ DEPENDENCIES
jquery-rails jquery-rails
mysql2 mysql2
pg pg
rails (= 4.1.4) rails (= 4.2.0)
rails_12factor rails_12factor
rb-readline rb-readline
round_robin_tournament round_robin_tournament