c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Rails upgrade

Browse Source
This commit is contained in:
Lee Lawlor 2014-05-06 13:08:38 -04:00
parent a8547385fc
commit 6344d7ce3e
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '4.0.3' gem 'rails', '4.0.5'
gem 'jquery-rails', '3.0.4' gem 'jquery-rails', '3.0.4'
gem 'rails_autolink' gem 'rails_autolink'
gem 'mysql2' gem 'mysql2'

56
Gemfile.lock
View File

@ -35,28 +35,28 @@ GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
ZenTest (4.9.5) ZenTest (4.9.5)
actionmailer (4.0.3) actionmailer (4.0.5)
actionpack (= 4.0.3) actionpack (= 4.0.5)
mail (~> 2.5.4) mail (~> 2.5.4)
actionpack (4.0.3) actionpack (4.0.5)
activesupport (= 4.0.3) activesupport (= 4.0.5)
builder (~> 3.1.0) builder (~> 3.1.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionpack-xml_parser (1.0.1) actionpack-xml_parser (1.0.1)
actionpack (>= 4.0.0.rc1) actionpack (>= 4.0.0.rc1)
activemodel (4.0.3) activemodel (4.0.5)
activesupport (= 4.0.3) activesupport (= 4.0.5)
builder (~> 3.1.0) builder (~> 3.1.0)
activerecord (4.0.3) activerecord (4.0.5)
activemodel (= 4.0.3) activemodel (= 4.0.5)
activerecord-deprecated_finders (~> 1.0.2) activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.3) activesupport (= 4.0.5)
arel (~> 4.0.0) arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3) activerecord-deprecated_finders (1.0.3)
activesupport (4.0.3) activesupport (4.0.5)
i18n (~> 0.6, >= 0.6.4) i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2) minitest (~> 4.2)
multi_json (~> 1.3) multi_json (~> 1.3)
thread_safe (~> 0.1) thread_safe (~> 0.1)
@ -72,7 +72,6 @@ GEM
arbre (1.0.1) arbre (1.0.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
arel (4.0.2) arel (4.0.2)
atomic (1.1.14)
autotest (4.4.6) autotest (4.4.6)
ZenTest (>= 4.4.1) ZenTest (>= 4.4.1)
autotest-rails (4.2.1) autotest-rails (4.2.1)
@ -185,7 +184,7 @@ GEM
mini_portile (0.5.2) mini_portile (0.5.2)
minitest (4.7.5) minitest (4.7.5)
mono_logger (1.1.0) mono_logger (1.1.0)
multi_json (1.8.4) multi_json (1.10.0)
multipart-post (1.2.0) multipart-post (1.2.0)
mysql2 (0.3.14) mysql2 (0.3.14)
nested_form (0.3.2) nested_form (0.3.2)
@ -215,22 +214,22 @@ GEM
rack (>= 1.0) rack (>= 1.0)
rack-utf8_sanitizer (1.1.0) rack-utf8_sanitizer (1.1.0)
rack (~> 1.0) rack (~> 1.0)
rails (4.0.3) rails (4.0.5)
actionmailer (= 4.0.3) actionmailer (= 4.0.5)
actionpack (= 4.0.3) actionpack (= 4.0.5)
activerecord (= 4.0.3) activerecord (= 4.0.5)
activesupport (= 4.0.3) activesupport (= 4.0.5)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.3) railties (= 4.0.5)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
rails_autolink (1.1.5) rails_autolink (1.1.5)
rails (> 3.1) rails (> 3.1)
railties (4.0.3) railties (4.0.5)
actionpack (= 4.0.3) actionpack (= 4.0.5)
activesupport (= 4.0.3) activesupport (= 4.0.5)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.1.1) rake (10.3.1)
ransack (1.1.0) ransack (1.1.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activerecord (>= 3.0) activerecord (>= 3.0)
@ -282,7 +281,7 @@ GEM
rack-protection (~> 1.4) rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4) tilt (~> 1.3, >= 1.3.4)
spork (0.9.2) spork (0.9.2)
sprockets (2.11.0) sprockets (2.12.1)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
@ -300,10 +299,9 @@ GEM
therubyracer (0.12.0) therubyracer (0.12.0)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
ref ref
thor (0.18.1) thor (0.19.1)
thread (0.1.3) thread (0.1.3)
thread_safe (0.1.3) thread_safe (0.3.3)
atomic
tilt (1.4.1) tilt (1.4.1)
tins (0.13.1) tins (0.13.1)
treetop (1.4.15) treetop (1.4.15)
@ -319,7 +317,7 @@ GEM
faraday (~> 0.8, < 0.10) faraday (~> 0.8, < 0.10)
multi_json (~> 1.0) multi_json (~> 1.0)
simple_oauth (~> 0.2) simple_oauth (~> 0.2)
tzinfo (0.3.38) tzinfo (0.3.39)
uglifier (2.4.0) uglifier (2.4.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
@ -369,7 +367,7 @@ DEPENDENCIES
puma puma
quiet_assets quiet_assets
rack-utf8_sanitizer rack-utf8_sanitizer
rails (= 4.0.3) rails (= 4.0.5)
rails_autolink rails_autolink
redis redis
resque-scheduler (= 2.3.1) resque-scheduler (= 2.3.1)