aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Legler <alex@a3li.li>2011-08-14 14:35:09 +0200
committerAlex Legler <alex@a3li.li>2011-08-14 14:35:09 +0200
commit2504a90a05f83eaede3bf2d888fce48ae715f920 (patch)
treee5b8b96c4b305b78f5e55ea74882ea1a35d4ef5c /Gemfile
parentUpdate to rails 2.3.12 and use Bundler (diff)
downloadglsamaker-2504a90a05f83eaede3bf2d888fce48ae715f920.tar.gz
glsamaker-2504a90a05f83eaede3bf2d888fce48ae715f920.tar.bz2
glsamaker-2504a90a05f83eaede3bf2d888fce48ae715f920.zip
First set of rails3 updates
.rails2 backups are still there, to be merged and removed on completion.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile41
1 files changed, 36 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 25acc4e..0f7bacb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,42 @@
source :rubygems
-gem "rails", "2.3.12"
-gem "json"
+gem 'rails', '3.1.0.rc5'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'mysql2'
+
+gem 'json'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+ gem 'sass-rails', "~> 3.1.0.rc"
+ gem 'coffee-rails', "~> 3.1.0.rc"
+ gem 'uglifier'
+end
+
+gem 'jquery-rails'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug'
+
gem "mechanize"
gem "fastercsv"
gem "diff-lcs", :require => "diff/lcs"
gem "nokogiri"
-gem "ci_reporter"
-gem "rspec"
-gem "rdoc" \ No newline at end of file
+
+# gem "rdoc"
+
+group :test do
+ gem "ci_reporter"
+ gem "rspec"
+
+end \ No newline at end of file