diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..68b3a4c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +1.9.3-p551 diff --git a/Gemfile b/Gemfile index bfd2c15..88889f3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.3' +gem 'rails', '4.0.2' -gem 'sqlite3', :group => [:development, :test] +gem 'sqlite3', '~> 1.3.8', :group => [:development, :test] gem 'pg', :group => :production # Use SCSS for stylesheets @@ -22,7 +22,7 @@ gem 'coffee-rails', '~> 4.0.0' gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' +gem 'turbolinks', '~> 2' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.2' diff --git a/Gemfile.lock b/Gemfile.lock index 72c9dbe..d2afe96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,25 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.3) - actionpack (= 4.0.3) + actionmailer (4.0.2) + actionpack (= 4.0.2) mail (~> 2.5.4) - actionpack (4.0.3) - activesupport (= 4.0.3) + actionpack (4.0.2) + activesupport (= 4.0.2) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.3) - activesupport (= 4.0.3) + activemodel (4.0.2) + activesupport (= 4.0.2) builder (~> 3.1.0) - activerecord (4.0.3) - activemodel (= 4.0.3) + activerecord (4.0.2) + activemodel (= 4.0.2) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.3) + activesupport (= 4.0.2) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.4) - activesupport (4.0.3) + activesupport (4.0.2) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) @@ -30,60 +30,60 @@ GEM coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.12.2) concurrent-ruby (1.1.6) erubis (2.7.0) - execjs (2.0.2) + execjs (2.7.0) hike (1.2.3) i18n (0.9.5) concurrent-ruby (~> 1.0) jbuilder (1.5.3) activesupport (>= 3.0.0) multi_json (>= 1.2.0) - jquery-rails (3.1.3) + jquery-rails (3.1.5) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.6) mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) minitest (4.7.5) multi_json (1.14.1) - pg (0.17.1) + pg (0.18.4) polyglot (0.3.5) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails (4.0.3) - actionmailer (= 4.0.3) - actionpack (= 4.0.3) - activerecord (= 4.0.3) - activesupport (= 4.0.3) + rails (4.0.2) + actionmailer (= 4.0.2) + actionpack (= 4.0.2) + activerecord (= 4.0.2) + activesupport (= 4.0.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.3) + railties (= 4.0.2) sprockets-rails (~> 2.0.0) rails-lineman (0.3.0) rake - railties (4.0.3) - actionpack (= 4.0.3) - activesupport (= 4.0.3) + railties (4.0.2) + actionpack (= 4.0.2) + activesupport (= 4.0.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (13.0.1) - rdoc (3.12.2) - json (~> 1.4) - sass (3.2.13) - sass-rails (4.0.1) + rake (12.2.1) + rdoc (4.3.0) + sass (3.2.19) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) - sprockets-rails (~> 2.0.0) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) + sass (~> 3.2.2) + sprockets (~> 2.8, < 3.0) + sprockets-rails (~> 2.0) + sdoc (0.4.2) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) @@ -93,19 +93,18 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.8) - thor (1.0.1) + sqlite3 (1.3.13) + thor (0.20.3) thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - turbolinks (2.1.0) + turbolinks (2.5.4) coffee-rails tzinfo (0.3.56) - uglifier (2.4.0) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) PLATFORMS ruby @@ -115,10 +114,13 @@ DEPENDENCIES jbuilder (~> 1.2) jquery-rails pg - rails (= 4.0.3) + rails (= 4.0.2) rails-lineman sass-rails (~> 4.0.0) sdoc - sqlite3 - turbolinks + sqlite3 (~> 1.3.8) + turbolinks (~> 2) uglifier (>= 1.3.0) + +BUNDLED WITH + 1.17.3