mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-17 15:50:13 +01:00
update to rails 4.1
This commit is contained in:
Reinier Balt
parent
4a3d5a74e6
commit
beac5bffb0
2 changed files with 59 additions and 54 deletions
8
Gemfile
8
Gemfile
|
|
@ -1,10 +1,10 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '~>4.0.0'
|
||||
gem 'sass-rails', '~>4.0.0'
|
||||
gem 'coffee-rails', '~>4.0.0'
|
||||
gem 'rails', '~>4.1'
|
||||
gem 'sass-rails', '~>4.0'
|
||||
gem 'coffee-rails', '~>4.0'
|
||||
|
||||
gem 'json'
|
||||
#gem 'json'
|
||||
|
||||
# todo: remove xml api
|
||||
gem 'actionpack-xml_parser', git: 'https://github.com/rails/actionpack-xml_parser'
|
||||
|
|
|
|||
105
Gemfile.lock
105
Gemfile.lock
|
|
@ -19,35 +19,37 @@ GEM
|
|||
specs:
|
||||
RedCloth (4.2.9)
|
||||
aasm (3.1.1)
|
||||
actionmailer (4.0.5)
|
||||
actionpack (= 4.0.5)
|
||||
actionmailer (4.1.1)
|
||||
actionpack (= 4.1.1)
|
||||
actionview (= 4.1.1)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.5)
|
||||
activesupport (= 4.0.5)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
actionpack (4.1.1)
|
||||
actionview (= 4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.5)
|
||||
activesupport (= 4.0.5)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.5)
|
||||
activemodel (= 4.0.5)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.5)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.5)
|
||||
actionview (4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
activemodel (4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.1)
|
||||
activemodel (= 4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
arel (~> 5.0.0)
|
||||
activesupport (4.1.1)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
tzinfo (~> 1.1)
|
||||
acts_as_list (0.4.0)
|
||||
activerecord (>= 3.0)
|
||||
arel (4.0.2)
|
||||
arel (5.0.1.20140414130214)
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.1.4)
|
||||
builder (3.2.2)
|
||||
bullet (4.9.0)
|
||||
activesupport
|
||||
uniform_notifier (~> 1.6.0)
|
||||
|
|
@ -71,17 +73,18 @@ GEM
|
|||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.3.14)
|
||||
cucumber (1.3.15)
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
gherkin (~> 2.12)
|
||||
multi_json (>= 1.7.5, < 2.0)
|
||||
multi_test (>= 0.1.1)
|
||||
cucumber-rails (1.4.0)
|
||||
capybara (>= 1.1.2)
|
||||
cucumber (>= 1.2.0)
|
||||
nokogiri (>= 1.5.0)
|
||||
rails (>= 3.0.0)
|
||||
cucumber-rails (1.4.1)
|
||||
capybara (>= 1.1.2, < 3)
|
||||
cucumber (>= 1.3.8, < 2)
|
||||
mime-types (~> 1.16)
|
||||
nokogiri (~> 1.5)
|
||||
rails (>= 3, < 5)
|
||||
database_cleaner (1.2.0)
|
||||
diff-lcs (1.2.5)
|
||||
docile (1.1.3)
|
||||
|
|
@ -108,37 +111,39 @@ GEM
|
|||
treetop (~> 1.4.8)
|
||||
metaclass (0.0.4)
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.5.3)
|
||||
minitest (4.7.5)
|
||||
mocha (1.0.0)
|
||||
mini_portile (0.6.0)
|
||||
minitest (5.3.4)
|
||||
mocha (1.1.0)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.10.0)
|
||||
multi_test (0.1.1)
|
||||
mysql2 (0.3.15)
|
||||
nokogiri (1.6.1)
|
||||
mini_portile (~> 0.5.0)
|
||||
mysql2 (0.3.16)
|
||||
nokogiri (1.6.2.1)
|
||||
mini_portile (= 0.6.0)
|
||||
polyglot (0.3.4)
|
||||
rack (1.5.2)
|
||||
rack-mini-profiler (0.9.1)
|
||||
rack (>= 1.1.3)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.5)
|
||||
actionmailer (= 4.0.5)
|
||||
actionpack (= 4.0.5)
|
||||
activerecord (= 4.0.5)
|
||||
activesupport (= 4.0.5)
|
||||
rails (4.1.1)
|
||||
actionmailer (= 4.1.1)
|
||||
actionpack (= 4.1.1)
|
||||
actionview (= 4.1.1)
|
||||
activemodel (= 4.1.1)
|
||||
activerecord (= 4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.5)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
railties (= 4.1.1)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails_autolink (1.1.5)
|
||||
rails (> 3.1)
|
||||
railties (4.0.5)
|
||||
actionpack (= 4.0.5)
|
||||
activesupport (= 4.0.5)
|
||||
railties (4.1.1)
|
||||
actionpack (= 4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.1)
|
||||
rake (10.3.2)
|
||||
ref (1.0.5)
|
||||
rspec-expectations (2.14.5)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
|
|
@ -167,7 +172,7 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.0.1)
|
||||
sprockets-rails (2.1.3)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
|
|
@ -188,7 +193,8 @@ GEM
|
|||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.39)
|
||||
tzinfo (1.1.0)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
|
@ -213,21 +219,20 @@ DEPENDENCIES
|
|||
cache_digests
|
||||
capybara
|
||||
codeclimate-test-reporter
|
||||
coffee-rails (~> 4.0.0)
|
||||
coffee-rails (~> 4.0)
|
||||
cucumber-rails
|
||||
database_cleaner
|
||||
factory_girl_rails
|
||||
htmlentities
|
||||
jquery-rails
|
||||
json
|
||||
mocha
|
||||
mysql2
|
||||
rack-mini-profiler
|
||||
rails (~> 4.0.0)
|
||||
rails (~> 4.1)
|
||||
rails_autolink
|
||||
rspec-expectations
|
||||
sanitize
|
||||
sass-rails (~> 4.0.0)
|
||||
sass-rails (~> 4.0)
|
||||
selenium-webdriver
|
||||
simplecov
|
||||
sqlite3
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue