nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump backbone-on-rails

Browse source
This commit is contained in:
Jonne Haß 2014-06-01 13:15:16 +02:00
parent 418c8d653d
commit f0b6f9315d
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -129,7 +129,7 @@ group :assets do
# JavaScript # JavaScript
gem 'backbone-on-rails', '1.1.0' gem 'backbone-on-rails', '1.1.1'
gem 'handlebars_assets', '0.12.0' gem 'handlebars_assets', '0.12.0'
gem 'jquery-rails', '3.0.4' gem 'jquery-rails', '3.0.4'

21
Gemfile.lock
View file

@ -42,11 +42,15 @@ GEM
activemodel activemodel
fog (>= 1.8.0) fog (>= 1.8.0)
atomic (1.1.14) atomic (1.1.14)
backbone-on-rails (1.1.0.0) backbone-on-rails (1.1.1.0)
actionmailer
actionpack
activemodel
activeresource
eco eco
ejs ejs
jquery-rails jquery-rails
rails (>= 3.1) railties
bcrypt-ruby (3.1.2) bcrypt-ruby (3.1.2)
bootstrap-sass (2.2.2.0) bootstrap-sass (2.2.2.0)
sass (~> 3.2) sass (~> 3.2)
@ -73,7 +77,7 @@ GEM
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.6.3) coffee-script-source (1.7.0)
compass (0.12.2) compass (0.12.2)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
@ -123,8 +127,7 @@ GEM
ffi (>= 1.3.0) ffi (>= 1.3.0)
mime-types (~> 1.18) mime-types (~> 1.18)
excon (0.31.0) excon (0.31.0)
execjs (1.4.0) execjs (2.1.0)
multi_json (~> 1.0)
factory_girl (4.3.0) factory_girl (4.3.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.3.0) factory_girl_rails (4.3.0)
@ -239,7 +242,7 @@ GEM
mobile-fu (1.2.2) mobile-fu (1.2.2)
rack-mobile-detect rack-mobile-detect
rails rails
multi_json (1.10.0) multi_json (1.10.1)
multi_test (0.0.3) multi_test (0.0.3)
multipart-post (1.2.0) multipart-post (1.2.0)
mysql2 (0.3.14) mysql2 (0.3.14)
@ -278,7 +281,7 @@ GEM
addressable addressable
nokogiri nokogiri
orm_adapter (0.5.0) orm_adapter (0.5.0)
polyglot (0.3.4) polyglot (0.3.5)
pry (0.9.12.4) pry (0.9.12.4)
coderay (~> 1.0) coderay (~> 1.0)
method_source (~> 0.8) method_source (~> 0.8)
@ -342,7 +345,7 @@ GEM
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
raindrops (0.12.0) raindrops (0.12.0)
rake (10.3.1) rake (10.3.2)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.3) rb-inotify (0.9.3)
rdoc (3.12.2) rdoc (3.12.2)
@ -460,7 +463,7 @@ DEPENDENCIES
acts_as_api (= 0.4.2) acts_as_api (= 0.4.2)
addressable (= 2.3.6) addressable (= 2.3.6)
asset_sync (= 1.0.0) asset_sync (= 1.0.0)
backbone-on-rails (= 1.1.0) backbone-on-rails (= 1.1.1)
bootstrap-sass (= 2.2.2.0) bootstrap-sass (= 2.2.2.0)
capybara (= 2.2.1) capybara (= 2.2.1)
carrierwave (= 0.9.0) carrierwave (= 0.9.0)