diff --git a/.gitignore b/.gitignore index 97e8767..b35f539 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ config/database.yml .DS_Store db/*.sqlite3 .bundle -.bundle/* \ No newline at end of file +.bundle/* +*~ \ No newline at end of file diff --git a/Gemfile b/Gemfile index 3a76010..c191e62 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,8 @@ source 'http://rubygems.org' gem 'rails', '3.2.1' gem 'mysql2' gem 'authlogic' -gem 'jquery-rails' +gem 'jquery-rails', '2.0.1' + # Bundle gems for the local environment. Make sure to # put test-only gems in this group so their generators diff --git a/Gemfile.lock b/Gemfile.lock index 50c8e89..caa6abe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,8 +42,8 @@ GEM hike (1.2.1) i18n (0.6.0) journey (1.0.1) - jquery-rails (2.0.0) - railties (>= 3.2.0.beta, < 5.0) + jquery-rails (2.0.1) + railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.6.5) mail (2.4.1) @@ -115,7 +115,7 @@ DEPENDENCIES annotate authlogic autotest - jquery-rails + jquery-rails (= 2.0.1) mysql2 rails (= 3.2.1) rspec (>= 2.0.0.beta.20)