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-05-17 18:25:42 +02:00
commit a9fd149f3d
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@ Changelog
0.4.0 0.4.0
----- -----
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'

23
Gemfile.lock
View File

@ -1,10 +1,3 @@
GIT
remote: git://github.com/bmabey/database_cleaner.git
revision: 20136e8987c222013d96e07c27d1230d2bbebd61
ref: 20136e89
specs:
database_cleaner (0.9.1)
GIT GIT
remote: git://github.com/diowa/twitter-bootstrap-rails.git remote: git://github.com/diowa/twitter-bootstrap-rails.git
revision: c0f5b77b917e7ff91978b49ff559671e4861888f revision: c0f5b77b917e7ff91978b49ff559671e4861888f
@ -83,13 +76,14 @@ GEM
thor thor
crack (0.3.2) crack (0.3.2)
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.5.0) debugger (1.6.0)
columnize (>= 0.3.1) columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0) debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.2.0) debugger-ruby_core_source (~> 1.2.1)
debugger-linecache (1.2.0) debugger-linecache (1.2.0)
debugger-ruby_core_source (1.2.0) debugger-ruby_core_source (1.2.2)
delorean (2.1.0) delorean (2.1.0)
chronic chronic
diff-lcs (1.2.4) diff-lcs (1.2.4)
@ -137,8 +131,7 @@ GEM
actionpack (>= 3.1) actionpack (>= 3.1)
less (~> 2.3.1) less (~> 2.3.1)
libv8 (3.11.8.17) libv8 (3.11.8.17)
mail (2.5.3) mail (2.5.4)
i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
meta_request (0.2.5) meta_request (0.2.5)
@ -220,7 +213,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
websocket (~> 1.0.4) websocket (~> 1.0.4)
simpleconfig (2.0.0) simpleconfig (2.0.1)
simplecov (0.7.1) simplecov (0.7.1)
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.7.1) simplecov-html (~> 0.7.1)
@ -229,7 +222,7 @@ GEM
rack (~> 1.5, >= 1.5.2) rack (~> 1.5, >= 1.5.2)
rack-protection (~> 1.4) rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4) tilt (~> 1.3, >= 1.3.4)
slop (3.4.4) slop (3.4.5)
sprockets (2.9.3) sprockets (2.9.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -283,7 +276,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