diff --git a/Gemfile.lock b/Gemfile.lock index 6949fa8..157cd88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,6 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.1) - atomic (1.1.14) bcrypt-ruby (3.1.2) better_errors (1.0.1) coderay (>= 1.0.0) @@ -34,10 +33,11 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.1.4) - carrierwave (0.9.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + carrierwave (1.3.2) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + ssrf_filter (~> 1.0) chart-js-rails (0.0.6) railties (> 3.1) coderay (1.1.0) @@ -48,6 +48,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.1.8) debug_inspector (0.0.2) devise (3.2.2) bcrypt-ruby (~> 3.0) @@ -81,14 +82,15 @@ GEM railties (~> 4.0.0) hike (1.2.3) hirb (0.7.1) - i18n (0.6.9) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.5.3) activesupport (>= 3.0.0) multi_json (>= 1.2.0) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.6) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -96,7 +98,7 @@ GEM mime-types (1.25.1) mini_portile (0.5.2) minitest (4.7.5) - multi_json (1.8.2) + multi_json (1.15.0) net-scp (1.1.2) net-ssh (>= 2.6.5) net-ssh (2.7.0) @@ -155,14 +157,14 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) + ssrf_filter (1.0.7) thor (0.18.1) - thread_safe (0.1.3) - atomic + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.38) + tzinfo (0.3.60) uglifier (2.4.0) execjs (>= 0.3.0) json (>= 1.8.0) diff --git a/README.rdoc b/README.rdoc index dd4e97e..9d3320a 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,28 +1,19 @@ -== README +== Weightable +========== -This README would normally document whatever steps are necessary to get the -application up and running. +== hello -Things you may want to cover: +Weightable allows users to track his or her weight, upload photos, and receive encouragement from friends. -* Ruby version -* System dependencies +Inside Weightable I used the following technologies: +* Rails 4.02 +* PostgreSQL Database +* Chart.js to visualize data +* Zurb-Foundation Framework +* Devise for user authentication +* Amazon S3 for remote image storage +* jQuery JavaScript library +* Remotipart to enable AJAX file uploads with jQuery -* Configuration -* Database creation - -* Database initialization - -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... - - -Please feel free to use a different markup language if you do not plan to run -rake doc:app.