gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with master

Browse source
This commit is contained in:
Chrisbr 2014-05-12 15:26:46 +02:00
parent d97e3603b1
commit 9e831cb514
2 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -76,12 +76,9 @@ 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/