Merge branch 'dev'
Showing
... | @@ -5,7 +5,7 @@ gem 'rails', '3.1.0' | ... | @@ -5,7 +5,7 @@ gem 'rails', '3.1.0' |
gem 'sqlite3' | gem 'sqlite3' | ||
gem 'devise', "1.4.7" | gem 'devise', "1.4.7" | ||
gem 'stamp' | gem 'stamp' | ||
gem 'will_paginate', '~> 3.0' | gem 'kaminari' | ||
gem 'haml-rails' | gem 'haml-rails' | ||
gem 'jquery-rails' | gem 'jquery-rails' | ||
gem 'grit', :git => 'git://github.com/gitlabhq/grit.git' | gem 'grit', :git => 'git://github.com/gitlabhq/grit.git' | ||
... | @@ -16,7 +16,6 @@ gem 'faker' | ... | @@ -16,7 +16,6 @@ gem 'faker' |
gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git' | gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git' | ||
gem "inifile" | gem "inifile" | ||
gem "pygments.rb", "0.2.3" | gem "pygments.rb", "0.2.3" | ||
gem "kaminari" | |||
gem "thin" | gem "thin" | ||
gem "git" | gem "git" | ||
gem "acts_as_list" | gem "acts_as_list" | ||
... | @@ -34,7 +33,7 @@ end | ... | @@ -34,7 +33,7 @@ end |
group :development, :test do | group :development, :test do | ||
gem 'rspec-rails' | gem 'rspec-rails' | ||
gem 'shoulda' | gem "shoulda", "~> 3.0.0.beta2" | ||
gem 'capybara' | gem 'capybara' | ||
gem 'autotest' | gem 'autotest' | ||
gem 'autotest-rails' | gem 'autotest-rails' | ||
... | ... |
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
Please register or sign in to comment