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

Merge pull request #10 from akinsgre/master

Browse Source 
Fixing Jquery plugin version that was yanked.
This commit is contained in:
Greg Akins 2013-02-11 17:11:13 -08:00
commit 9e7f4aff09
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -5,4 +5,5 @@ config/database.yml
.DS_Store .DS_Store
db/*.sqlite3 db/*.sqlite3
.bundle .bundle
.bundle/* .bundle/*
*~

3
Gemfile
View File

@ -3,7 +3,8 @@ source 'http://rubygems.org'
gem 'rails', '3.2.1' gem 'rails', '3.2.1'
gem 'mysql2' gem 'mysql2'
gem 'authlogic' gem 'authlogic'
gem 'jquery-rails' gem 'jquery-rails', '2.0.1'
# Bundle gems for the local environment. Make sure to # Bundle gems for the local environment. Make sure to
# put test-only gems in this group so their generators # put test-only gems in this group so their generators

6
Gemfile.lock
View File

@ -42,8 +42,8 @@ GEM
hike (1.2.1) hike (1.2.1)
i18n (0.6.0) i18n (0.6.0)
journey (1.0.1) journey (1.0.1)
jquery-rails (2.0.0) jquery-rails (2.0.1)
railties (>= 3.2.0.beta, < 5.0) railties (>= 3.2.0, < 5.0)
thor (~> 0.14) thor (~> 0.14)
json (1.6.5) json (1.6.5)
mail (2.4.1) mail (2.4.1)
@ -115,7 +115,7 @@ DEPENDENCIES
annotate annotate
authlogic authlogic
autotest autotest
jquery-rails jquery-rails (= 2.0.1)
mysql2 mysql2
rails (= 3.2.1) rails (= 3.2.1)
rspec (>= 2.0.0.beta.20) rspec (>= 2.0.0.beta.20)