diff --git a/Gemfile b/Gemfile index 91fb81b..731b810 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.6' +gem 'rails', '3.2.8' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -10,13 +10,13 @@ gem 'sqlite3' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.1' + gem 'sass-rails' + gem 'coffee-rails' # See https://github.com/sstephenson/execjs#readme for more supported runtimes # gem 'therubyracer', :platforms => :ruby - gem 'uglifier', '>= 1.0.3' + gem 'uglifier' end gem 'jquery-rails' @@ -25,7 +25,7 @@ gem 'paperclip' gem 'twitter-bootstrap-rails' # To use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' +# gem 'bcrypt-ruby' # To use Jbuilder templates for JSON # gem 'jbuilder' diff --git a/Gemfile.lock b/Gemfile.lock index b56056f..826474a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.6) - actionpack (= 3.2.6) + actionmailer (3.2.8) + actionpack (= 3.2.8) mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + actionpack (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) + activemodel (3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + activerecord (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) + activeresource (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) + activesupport (3.2.8) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) - builder (3.0.0) - cocaine (0.2.1) + builder (3.0.3) + cocaine (0.3.2) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -43,16 +43,16 @@ GEM execjs (1.4.0) multi_json (~> 1.0) hike (1.2.1) - i18n (0.6.0) + i18n (0.6.1) journey (1.0.4) - jquery-fileupload-rails (0.3.0) + jquery-fileupload-rails (0.3.4) actionpack (>= 3.1) railties (>= 3.1) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) + jquery-rails (2.1.3) + railties (>= 3.1.0, < 5.0) thor (~> 0.14) - json (1.7.4) - less (2.2.1) + json (1.7.5) + less (2.2.2) commonjs (~> 0.2.6) less-rails (2.2.3) actionpack (>= 3.1) @@ -64,7 +64,7 @@ GEM treetop (~> 1.4.8) mime-types (1.19) multi_json (1.3.6) - paperclip (3.1.4) + paperclip (3.2.0) activemodel (>= 3.0.0) activerecord (>= 3.0.0) activesupport (>= 3.0.0) @@ -76,19 +76,19 @@ GEM rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) + rails (3.2.8) + actionmailer (= 3.2.8) + actionpack (= 3.2.8) + activerecord (= 3.2.8) + activeresource (= 3.2.8) + activesupport (= 3.2.8) bundler (~> 1.0) - railties (= 3.2.6) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + railties (= 3.2.8) + railties (3.2.8) + actionpack (= 3.2.8) + activesupport (= 3.2.8) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -96,7 +96,7 @@ GEM rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - sass (3.1.20) + sass (3.2.1) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) @@ -106,33 +106,33 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) - therubyracer (0.10.1) + therubyracer (0.10.2) libv8 (~> 3.3.10) - thor (0.15.4) + thor (0.16.0) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.1.1) + twitter-bootstrap-rails (2.1.3) actionpack (>= 3.1) - less-rails (~> 2.2.2) + less-rails (~> 2.2.3) railties (>= 3.1) - therubyracer (= 0.10.1) + therubyracer (~> 0.10.2) tzinfo (0.3.33) - uglifier (1.2.6) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (~> 1.3) + multi_json (~> 1.0, >= 1.0.2) PLATFORMS ruby DEPENDENCIES - coffee-rails (~> 3.2.1) + coffee-rails jquery-fileupload-rails jquery-rails paperclip - rails (= 3.2.6) - sass-rails (~> 3.2.3) + rails (= 3.2.8) + sass-rails sqlite3 twitter-bootstrap-rails - uglifier (>= 1.0.3) + uglifier diff --git a/README.md b/README.md index 9810a46..eeaf4b1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This is an example app that uses the following gems to upload files for your Rai This app also uses [twitter-bootstrap-rails](https://github.com/seyhunak/twitter-bootstrap-rails) but is not required. -This app uses Rails 3.2.6. +This app uses Rails 3.2.8. ## Running the app diff --git a/app/views/uploads/index.html.erb b/app/views/uploads/index.html.erb index c897706..41b8a36 100644 --- a/app/views/uploads/index.html.erb +++ b/app/views/uploads/index.html.erb @@ -22,7 +22,7 @@ Delete - +