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

Use latest Tolk release, which supports Rails 4

Browse source
This commit is contained in:
Dan Rice 2014-05-02 11:26:10 -04:00
parent 87ede1efce
commit 6d468e229e
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -44,7 +44,7 @@ gem 'bcrypt-ruby', '~> 3.0.0'
group :development do group :development do
gem "yard" gem "yard"
gem "tolk", git: 'https://github.com/tolk/tolk' gem 'tolk', '>=1.5.0'
gem "bullet" gem "bullet"
gem "rack-mini-profiler" gem "rack-mini-profiler"
end end

13
Gemfile.lock
View file

@ -14,14 +14,6 @@ GIT
actionpack-xml_parser (1.0.1) actionpack-xml_parser (1.0.1)
actionpack (>= 4.0.0, < 5) actionpack (>= 4.0.0, < 5)
GIT
remote: https://github.com/tolk/tolk
revision: 06f99b3b747f2f8f7297fa35ec9c9d5f38eaada6
specs:
tolk (1.4.00)
safe_yaml (~> 0.8)
will_paginate
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -192,6 +184,9 @@ GEM
atomic (>= 1.1.7, < 2) atomic (>= 1.1.7, < 2)
tilt (1.4.1) tilt (1.4.1)
timecop (0.6.3) timecop (0.6.3)
tolk (1.5.0)
safe_yaml (~> 0.8)
will_paginate
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
@ -242,7 +237,7 @@ DEPENDENCIES
swf_fu swf_fu
therubyracer therubyracer
timecop (~> 0.6.2) timecop (~> 0.6.2)
tolk! tolk (>= 1.5.0)
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
will_paginate will_paginate
yard yard