gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with master

Browse source
This commit is contained in:
Chrisbr 2014-05-12 15:26:18 +02:00
commit d97e3603b1
8 changed files with 125 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -76,8 +76,12 @@ group :development, :test do
gem 'rspec', '>= 3.0.0.beta'
gem 'rspec-rails', '>= 3.0.0.beta'
gem 'capybara'
<<<<<<< HEAD
gem 'database_cleaner'
gem 'capybara-webkit'
=======
gem 'shoulda'
>>>>>>> 374efd311fb7f82d0e8257a62675a663904708d5
end
# FIXME: We should use http://weblog.rubyonrails.org/2012/3/21/strong-parameters/