Permalink
Browse files

Gemfile updated to rails 3.2.6

  • Loading branch information...
1 parent 5eb4efa commit 448429bb89d724ebc1489eff48bbf1701568cf51 @yorch yorch committed Jun 23, 2012
Showing with 126 additions and 134 deletions.
  1. +26 −19 Gemfile
  2. +100 −115 Gemfile.lock
View
45 Gemfile
@@ -1,32 +1,39 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
-gem 'rails', '3.0.5'
+gem 'rails', '3.2.6'
gem 'omniauth'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3'
-# Use unicorn as the web server
+
+# 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'
+
+ # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+ # gem 'therubyracer', :platforms => :ruby
+
+ gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
# gem 'unicorn'
# Deploy with Capistrano
# gem 'capistrano'
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-# gem 'webrat'
-# end
+# To use debugger
+# gem 'debugger'
View
@@ -1,131 +1,116 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.5)
- actionpack (= 3.0.5)
- mail (~> 2.2.15)
- actionpack (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.4)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- arel (~> 2.0.2)
- tzinfo (~> 0.3.23)
- activeresource (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- activesupport (3.0.5)
- addressable (2.2.4)
- arel (2.0.9)
- builder (2.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- faraday (0.5.7)
- addressable (~> 2.2.4)
- multipart-post (~> 1.1.0)
- rack (>= 1.1.0, < 2)
- i18n (0.5.0)
- mail (2.2.15)
- activesupport (>= 2.3.6)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
+ mail (~> 2.4.4)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ journey (~> 1.0.1)
+ 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)
+ builder (~> 3.0.0)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
+ i18n (~> 0.6)
+ multi_json (~> 1.0)
+ arel (3.0.2)
+ builder (3.0.0)
+ coffee-rails (3.2.2)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.2.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.3.3)
+ erubis (2.7.0)
+ execjs (1.4.0)
+ multi_json (~> 1.0)
+ hashie (1.2.0)
+ hike (1.2.1)
+ i18n (0.6.0)
+ journey (1.0.4)
+ jquery-rails (2.0.2)
+ railties (>= 3.2.0, < 5.0)
+ thor (~> 0.14)
+ json (1.7.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (0.0.5)
- multipart-post (1.1.0)
- net-ldap (0.1.1)
- nokogiri (1.4.4)
- oa-basic (0.2.0)
- multi_json (~> 0.0.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.0)
- rest-client (~> 1.6.0)
- oa-core (0.2.0)
- rack (~> 1.1)
- oa-enterprise (0.2.0)
- net-ldap (~> 0.1.1)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.0)
- pyu-ruby-sasl (~> 0.0.3.1)
- rubyntlm (~> 0.1.1)
- oa-more (0.2.0)
- multi_json (~> 0.0.2)
- oa-core (= 0.2.0)
- rest-client (~> 1.6.0)
- oa-oauth (0.2.0)
- multi_json (~> 0.0.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.0)
- oauth (~> 0.4.0)
- oauth2 (~> 0.1.1)
- oa-openid (0.2.0)
- oa-core (= 0.2.0)
- rack-openid (~> 1.2.0)
- ruby-openid-apps-discovery
- oauth (0.4.4)
- oauth2 (0.1.1)
- faraday (~> 0.5.0)
- multi_json (~> 0.0.4)
- omniauth (0.2.0)
- oa-basic (= 0.2.0)
- oa-core (= 0.2.0)
- oa-enterprise (= 0.2.0)
- oa-more (= 0.2.0)
- oa-oauth (= 0.2.0)
- oa-openid (= 0.2.0)
- polyglot (0.3.1)
- pyu-ruby-sasl (0.0.3.2)
- rack (1.2.2)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-openid (1.2.0)
- rack (>= 1.1.0)
- ruby-openid (>= 2.1.8)
- rack-test (0.5.7)
+ mime-types (1.19)
+ multi_json (1.3.6)
+ omniauth (1.1.0)
+ hashie (~> 1.2)
+ rack
+ polyglot (0.3.3)
+ rack (1.4.1)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.5)
- actionmailer (= 3.0.5)
- actionpack (= 3.0.5)
- activerecord (= 3.0.5)
- activeresource (= 3.0.5)
- activesupport (= 3.0.5)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.0.5)
- railties (3.0.5)
- actionpack (= 3.0.5)
- activesupport (= 3.0.5)
+ railties (= 3.2.6)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- thor (~> 0.14.4)
- rake (0.8.7)
- rest-client (1.6.1)
- mime-types (>= 1.16)
- ruby-openid (2.1.8)
- ruby-openid-apps-discovery (1.2.0)
- ruby-openid (>= 2.1.7)
- rubyntlm (0.1.1)
- sqlite3 (1.3.3)
- thor (0.14.6)
- treetop (1.4.9)
+ rdoc (~> 3.4)
+ thor (>= 0.14.6, < 2.0)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ sass (3.1.19)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ sprockets (2.1.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
+ thor (0.15.3)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.25)
+ tzinfo (0.3.33)
+ uglifier (1.2.5)
+ execjs (>= 0.3.0)
+ multi_json (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
+ coffee-rails (~> 3.2.1)
+ jquery-rails
omniauth
- rails (= 3.0.5)
+ rails (= 3.2.6)
+ sass-rails (~> 3.2.3)
sqlite3
+ uglifier (>= 1.0.3)

0 comments on commit 448429b

Please sign in to comment.