mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-24 03:00:12 +01:00
update for rails4rc2
This commit is contained in:
Reinier Balt
parent
4a485558e2
commit
20b4b626fe
2 changed files with 38 additions and 93 deletions
4
Gemfile
4
Gemfile
|
|
@ -1,7 +1,7 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '4.0.0.rc1'
|
||||
gem 'sass-rails', '4.0.0.rc1'
|
||||
gem 'rails', '4.0.0.rc2'
|
||||
gem 'sass-rails', '4.0.0.rc2'
|
||||
gem 'coffee-rails', '~>4.0'
|
||||
|
||||
# todo: remove xml api
|
||||
|
|
|
|||
127
Gemfile.lock
127
Gemfile.lock
|
|
@ -1,40 +1,34 @@
|
|||
GIT
|
||||
remote: git://github.com/rails/actionpack-xml_parser.git
|
||||
revision: 13b8750446f472d7d5191d79eee2209dbff675d6
|
||||
revision: 246653ab3670f329176c1e77e6cd1a632466f06e
|
||||
specs:
|
||||
actionpack-xml_parser (0.1.0)
|
||||
actionpack (~> 4.0.0.beta)
|
||||
actionpack-xml_parser (1.0.0)
|
||||
actionpack (>= 4.0.0.rc1, < 4.1)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
RedCloth (4.2.9)
|
||||
<<<<<<< HEAD
|
||||
aasm (3.0.18)
|
||||
actionmailer (4.0.0.rc1)
|
||||
actionpack (= 4.0.0.rc1)
|
||||
=======
|
||||
aasm (3.0.19)
|
||||
actionmailer (3.2.13)
|
||||
actionpack (= 3.2.13)
|
||||
>>>>>>> master
|
||||
actionmailer (4.0.0.rc2)
|
||||
actionpack (= 4.0.0.rc2)
|
||||
mail (~> 2.5.3)
|
||||
actionpack (4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
actionpack (4.0.0.rc2)
|
||||
activesupport (= 4.0.0.rc2)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
activemodel (4.0.0.rc2)
|
||||
activesupport (= 4.0.0.rc2)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.0.rc1)
|
||||
activemodel (= 4.0.0.rc1)
|
||||
activerecord (4.0.0.rc2)
|
||||
activemodel (= 4.0.0.rc2)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc2)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.2)
|
||||
activesupport (4.0.0.rc1)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.0.rc2)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
|
|
@ -42,11 +36,7 @@ GEM
|
|||
tzinfo (~> 0.3.37)
|
||||
acts_as_list (0.2.0)
|
||||
activerecord (>= 3.0)
|
||||
<<<<<<< HEAD
|
||||
arel (4.0.0)
|
||||
=======
|
||||
arel (3.0.2)
|
||||
>>>>>>> master
|
||||
aruba (0.5.3)
|
||||
childprocess (>= 0.3.6)
|
||||
cucumber (>= 1.1.1)
|
||||
|
|
@ -56,7 +46,7 @@ GEM
|
|||
builder (3.1.4)
|
||||
bullet (4.6.0)
|
||||
uniform_notifier
|
||||
cache_digests (0.3.0)
|
||||
cache_digests (0.3.1)
|
||||
actionpack (>= 3.2)
|
||||
thread_safe
|
||||
capybara (2.1.0)
|
||||
|
|
@ -83,10 +73,6 @@ GEM
|
|||
capybara (>= 1.1.2)
|
||||
cucumber (>= 1.1.8)
|
||||
nokogiri (>= 1.5.0)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
rails (~> 3.0)
|
||||
>>>>>>> master
|
||||
database_cleaner (1.0.1)
|
||||
diff-lcs (1.2.4)
|
||||
erubis (2.7.0)
|
||||
|
|
@ -102,99 +88,58 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
hike (1.2.3)
|
||||
htmlentities (4.3.1)
|
||||
<<<<<<< HEAD
|
||||
i18n (0.6.4)
|
||||
jquery-rails (2.2.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
=======
|
||||
i18n (0.6.1)
|
||||
journey (1.0.4)
|
||||
jquery-rails (3.0.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.0)
|
||||
>>>>>>> master
|
||||
libv8 (3.11.8.17)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
metaclass (0.0.1)
|
||||
mime-types (1.23)
|
||||
<<<<<<< HEAD
|
||||
mini_portile (0.5.0)
|
||||
minitest (4.7.4)
|
||||
mocha (0.14.0)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.7.3)
|
||||
=======
|
||||
mocha (0.14.0)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.7.6)
|
||||
>>>>>>> master
|
||||
multi_json (1.7.7)
|
||||
mysql2 (0.3.11)
|
||||
nokogiri (1.5.10)
|
||||
nokogiri (1.6.0)
|
||||
mini_portile (~> 0.5.0)
|
||||
polyglot (0.3.3)
|
||||
rack (1.5.2)
|
||||
rack-mini-profiler (0.1.26)
|
||||
rack (>= 1.1.3)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
<<<<<<< HEAD
|
||||
rails (4.0.0.rc1)
|
||||
actionmailer (= 4.0.0.rc1)
|
||||
actionpack (= 4.0.0.rc1)
|
||||
activerecord (= 4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
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)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.0.rc1)
|
||||
sprockets-rails (~> 2.0.0.rc4)
|
||||
railties (= 4.0.0.rc2)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
rails_autolink (1.1.0)
|
||||
rails (> 3.1)
|
||||
railties (4.0.0.rc1)
|
||||
actionpack (= 4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
=======
|
||||
rails (3.2.13)
|
||||
actionmailer (= 3.2.13)
|
||||
actionpack (= 3.2.13)
|
||||
activerecord (= 3.2.13)
|
||||
activeresource (= 3.2.13)
|
||||
activesupport (= 3.2.13)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.13)
|
||||
rails_autolink (1.1.0)
|
||||
rails (> 3.1)
|
||||
railties (3.2.13)
|
||||
actionpack (= 3.2.13)
|
||||
activesupport (= 3.2.13)
|
||||
rack-ssl (~> 1.3.2)
|
||||
>>>>>>> master
|
||||
railties (4.0.0.rc2)
|
||||
actionpack (= 4.0.0.rc2)
|
||||
activesupport (= 4.0.0.rc2)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.0.4)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
>>>>>>> master
|
||||
ref (1.0.5)
|
||||
rspec-expectations (2.13.0)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rubyzip (0.9.9)
|
||||
safe_yaml (0.9.3)
|
||||
sanitize (2.0.3)
|
||||
nokogiri (>= 1.4.4, < 1.6)
|
||||
sanitize (2.0.4)
|
||||
nokogiri (~> 1.6.0)
|
||||
sass (3.2.9)
|
||||
<<<<<<< HEAD
|
||||
sass-rails (4.0.0.rc1)
|
||||
sass-rails (4.0.0.rc2)
|
||||
railties (>= 4.0.0.beta, < 5.0)
|
||||
=======
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
>>>>>>> master
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0.rc0)
|
||||
tilt (~> 1.3)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
selenium-webdriver (2.33.0)
|
||||
childprocess (>= 0.2.5)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -209,7 +154,7 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.0.0.rc4)
|
||||
sprockets-rails (2.0.0)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
|
|
@ -264,11 +209,11 @@ DEPENDENCIES
|
|||
mocha
|
||||
mysql2
|
||||
rack-mini-profiler
|
||||
rails (= 4.0.0.rc1)
|
||||
rails (= 4.0.0.rc2)
|
||||
rails_autolink
|
||||
rspec-expectations
|
||||
sanitize
|
||||
sass-rails (= 4.0.0.rc1)
|
||||
sass-rails (= 4.0.0.rc2)
|
||||
selenium-webdriver
|
||||
simplecov
|
||||
sqlite3
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue