Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-04 03:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into new-gui

Browse source
This commit is contained in:
Reinier Balt 2013-06-25 16:51:05 +02:00
commit b79efb3f31
2 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Gemfile.lock
View file

@ -20,25 +20,25 @@ GEM
specs:
RedCloth (4.2.9)
aasm (3.0.19)
actionmailer (4.0.0.rc2)
actionpack (= 4.0.0.rc2)
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0.rc2)
activesupport (= 4.0.0.rc2)
actionpack (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0.rc2)
activesupport (= 4.0.0.rc2)
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activerecord (4.0.0.rc2)
activemodel (= 4.0.0.rc2)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0.rc2)
activesupport (= 4.0.0)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0.rc2)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
@ -129,19 +129,19 @@ GEM
rack (>= 1.1.3)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0.rc2)
actionmailer (= 4.0.0.rc2)
actionpack (= 4.0.0.rc2)
activerecord (= 4.0.0.rc2)
activesupport (= 4.0.0.rc2)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0.rc2)
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
rails_autolink (1.1.0)
rails (> 3.1)
railties (4.0.0.rc2)
actionpack (= 4.0.0.rc2)
activesupport (= 4.0.0.rc2)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
@ -153,7 +153,7 @@ GEM
sanitize (2.0.4)
nokogiri (~> 1.6.0)
sass (3.2.9)
sass-rails (4.0.0.rc2)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
@ -213,11 +213,11 @@ DEPENDENCIES
actionpack-xml_parser!
acts_as_list
aruba
bcrypt-ruby
bcrypt-ruby (~> 3.0.0)
bullet
cache_digests
capybara
coffee-rails (~> 4.0)
coffee-rails (~> 4.0.0)
cucumber-rails
database_cleaner
factory_girl_rails
@ -228,11 +228,11 @@ DEPENDENCIES
mousetrap-rails
mysql2
rack-mini-profiler
rails (= 4.0.0.rc2)
rails (~> 4.0.0)
rails_autolink
rspec-expectations
sanitize
sass-rails (= 4.0.0.rc2)
sass-rails (~> 4.0.0)
selenium-webdriver
simplecov
sqlite3