bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Cesidio Di Landa 2013-06-12 11:04:54 +02:00
commit 6cfaa0ef35
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -5,6 +5,10 @@ Changelog
----- -----
* Rails 4 rc2 * Rails 4 rc2
0.3.1
-----
* Updated gems
0.3.0 0.3.0
----- -----
* Fontawesome 3.1.1 * Fontawesome 3.1.1

2
Gemfile
View File

@ -64,7 +64,7 @@ end
group :test do group :test do
gem 'capybara' gem 'capybara'
gem 'coveralls', require: false gem 'coveralls', require: false
gem 'database_cleaner', github: 'bmabey/database_cleaner', ref: '20136e89' gem 'database_cleaner'
gem 'email_spec' gem 'email_spec'
gem 'launchy' gem 'launchy'
gem 'rspec' gem 'rspec'

3
Gemfile.lock
View File

@ -73,6 +73,7 @@ GEM
crack (0.4.0) crack (0.4.0)
safe_yaml (~> 0.9.0) safe_yaml (~> 0.9.0)
daemons (1.1.9) daemons (1.1.9)
database_cleaner (1.0.1)
debug_inspector (0.0.2) debug_inspector (0.0.2)
debugger (1.6.0) debugger (1.6.0)
columnize (>= 0.3.1) columnize (>= 0.3.1)
@ -279,7 +280,7 @@ DEPENDENCIES
capybara capybara
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)
coveralls coveralls
database_cleaner! database_cleaner
debugger debugger
delorean delorean
email_spec email_spec