bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-07-09 18:33:08 +02:00
parent 01d9c48c2b
commit cdb3596d04
2 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+2 -2
View File
@@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '4.1.0' gem 'rails', '4.1.4'
gem 'rack-cors', :require => 'rack/cors' gem 'rack-cors', :require => 'rack/cors'
# Bundle edge Rails instead: # Bundle edge Rails instead:
@@ -18,7 +18,7 @@ group :assets do
gem 'jquery-ui-rails' gem 'jquery-ui-rails'
gem 'ember-source' #, github: 'emberjs/ember.js', require: 'ember/source' gem 'ember-source' #, github: 'emberjs/ember.js', require: 'ember/source'
gem 'ember-rails' gem 'ember-rails'
gem 'sass-rails' #, '~> 4.0.2' gem 'sass-rails', '~> 4.0.2'
gem 'coffee-rails' #, '~> 3.2.1' gem 'coffee-rails' #, '~> 3.2.1'
#gem 'twitter-bootstrap-rails' #gem 'twitter-bootstrap-rails'
# Only for mobile assets precompile, not used in this project # Only for mobile assets precompile, not used in this project
Gemfile.lock
+38 -35
View File
@@ -1,6 +1,6 @@
GIT GIT
remote: git://github.com/bterkuile/cmtool.git remote: git://github.com/bterkuile/cmtool.git
revision: 98191722e04dc3bd8b96be347929215e7d7c9059 revision: af57f9389245001e1a36e9c01383b031ca402e03
specs: specs:
cmtool (1.0.0) cmtool (1.0.0)
bourbon bourbon
@@ -37,7 +37,7 @@ GIT
GIT GIT
remote: git://github.com/bterkuile/simply_stored.git remote: git://github.com/bterkuile/simply_stored.git
revision: 7e29edef26f6e598c0804ba28929e2fad7045931 revision: a4b672f68cbcf275aa10fc5014a3763238691956
specs: specs:
simply_stored (1.0.0) simply_stored (1.0.0)
activesupport activesupport
@@ -47,30 +47,30 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.0) actionmailer (4.1.4)
actionpack (= 4.1.0) actionpack (= 4.1.4)
actionview (= 4.1.0) actionview (= 4.1.4)
mail (~> 2.5.4) mail (~> 2.5.4)
actionpack (4.1.0) actionpack (4.1.4)
actionview (= 4.1.0) actionview (= 4.1.4)
activesupport (= 4.1.0) activesupport (= 4.1.4)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.0) actionview (4.1.4)
activesupport (= 4.1.0) activesupport (= 4.1.4)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
active_decorator (0.3.4) active_decorator (0.3.4)
active_model_serializers (0.8.1) active_model_serializers (0.8.1)
activemodel (>= 3.0) activemodel (>= 3.0)
activemodel (4.1.0) activemodel (4.1.4)
activesupport (= 4.1.0) activesupport (= 4.1.4)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.0) activerecord (4.1.4)
activemodel (= 4.1.0) activemodel (= 4.1.4)
activesupport (= 4.1.0) activesupport (= 4.1.4)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.0) activesupport (4.1.4)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@@ -158,7 +158,7 @@ GEM
handlebars-source (> 1.0.0) handlebars-source (> 1.0.0)
jquery-rails (>= 1.0.17) jquery-rails (>= 1.0.17)
railties (>= 3.1) railties (>= 3.1)
ember-source (1.5.1.1) ember-source (1.6.0)
handlebars-source (~> 1.0) handlebars-source (~> 1.0)
emblem-rails (0.2.1) emblem-rails (0.2.1)
barber-emblem (~> 0.1.1) barber-emblem (~> 0.1.1)
@@ -174,7 +174,7 @@ GEM
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.9.0) faraday (0.9.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faye (1.0.1) faye (1.0.3)
cookiejar (>= 0.3.0) cookiejar (>= 0.3.0)
em-http-request (>= 0.3.0) em-http-request (>= 0.3.0)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
@@ -233,7 +233,7 @@ GEM
mini_magick (3.7.0) mini_magick (3.7.0)
subexec (~> 0.2.1) subexec (~> 0.2.1)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.3.5) minitest (5.4.0)
multi_json (1.10.1) multi_json (1.10.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
@@ -256,7 +256,7 @@ GEM
oauth2 (~> 0.9.3) oauth2 (~> 0.9.3)
omniauth (~> 1.2) omniauth (~> 1.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paperclip (4.1.1) paperclip (4.2.0)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
cocaine (~> 0.5.3) cocaine (~> 0.5.3)
@@ -274,24 +274,27 @@ GEM
rack-cors (0.2.9) rack-cors (0.2.9)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.0) rails (4.1.4)
actionmailer (= 4.1.0) actionmailer (= 4.1.4)
actionpack (= 4.1.0) actionpack (= 4.1.4)
actionview (= 4.1.0) actionview (= 4.1.4)
activemodel (= 4.1.0) activemodel (= 4.1.4)
activerecord (= 4.1.0) activerecord (= 4.1.4)
activesupport (= 4.1.0) activesupport (= 4.1.4)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.0) railties (= 4.1.4)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
railties (4.1.0) railties (4.1.4)
actionpack (= 4.1.0) actionpack (= 4.1.4)
activesupport (= 4.1.0) activesupport (= 4.1.4)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
rest-client (1.6.7) rdoc (4.1.1)
mime-types (>= 1.16) json (~> 1.4)
rest-client (1.6.8)
mime-types (~> 1.16)
rdoc (>= 2.4.2)
rqrcode (0.4.2) rqrcode (0.4.2)
rspec (3.0.0) rspec (3.0.0)
rspec-core (~> 3.0.0) rspec-core (~> 3.0.0)
@@ -414,10 +417,10 @@ DEPENDENCIES
pry-rails pry-rails
quiet_assets quiet_assets
rack-cors rack-cors
rails (= 4.1.0) rails (= 4.1.4)
rqrcode rqrcode
rspec-rails rspec-rails
sass-rails sass-rails (~> 4.0.2)
simple_form simple_form
simplecov simplecov
simply_stored! simply_stored!