Big upgrade and supplier style upgrades

This commit is contained in:
2015-02-13 15:58:11 +01:00
parent de3f2f7cae
commit 78f1056dc7
19 changed files with 238 additions and 242 deletions
+108 -110
View File
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/bterkuile/cmtool.git
revision: 323e68bcad3b21cd580d3aff5771d99a805fc985
revision: e2f8459960eb4eff12365c6ebd60278d79eaab8f
specs:
cmtool (1.0.0)
bourbon
@@ -28,7 +28,7 @@ GIT
GIT
remote: git://github.com/bterkuile/simply_stored.git
revision: 8f00644f7a8e82dba057c01f86dbb8bc3154d5d8
revision: 652caf8c2cfe4f828477f8b76d0cd201851cd53d
specs:
simply_stored (1.0.0)
activesupport
@@ -59,60 +59,58 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.0.rc2)
actionpack (= 4.2.0.rc2)
actionview (= 4.2.0.rc2)
activejob (= 4.2.0.rc2)
actionmailer (4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0.rc2)
actionview (= 4.2.0.rc2)
activesupport (= 4.2.0.rc2)
rack (~> 1.6.0.beta2)
actionpack (4.2.0)
actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0.rc2)
activesupport (= 4.2.0.rc2)
actionview (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
active_decorator (0.3.4)
active_decorator (0.4.0)
active_model_serializers (0.9.0)
activemodel (>= 3.2)
activejob (4.2.0.rc2)
activesupport (= 4.2.0.rc2)
activejob (4.2.0)
activesupport (= 4.2.0)
globalid (>= 0.3.0)
activemodel (4.2.0.rc2)
activesupport (= 4.2.0.rc2)
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
activerecord (4.2.0.rc2)
activemodel (= 4.2.0.rc2)
activesupport (= 4.2.0.rc2)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activesupport (4.2.0.rc2)
i18n (>= 0.7.0.beta1, < 0.8)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.6)
addressable (2.3.7)
arel (6.0.0)
barber (0.5.0)
barber (0.6.0)
ember-source
execjs
handlebars-source (>= 1.0.0.rc.4)
barber-emblem (0.1.1)
barber-emblem (0.1.2)
barber (>= 0.4.1)
emblem-source
bcrypt (3.1.9)
bcrypt (3.1.10)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
bourbon (4.0.2)
sass (~> 3.3)
bourbon (4.2.0)
sass (~> 3.4)
thor
builder (3.2.2)
capistrano (3.3.5)
@@ -120,7 +118,7 @@ GEM
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
capistrano-bundler (1.1.3)
capistrano-bundler (1.1.4)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-local-precompile (0.0.2)
@@ -138,7 +136,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-screenshot (1.0.3)
capybara-screenshot (1.0.5)
capybara (>= 1.0, < 3)
colored
launchy
@@ -155,7 +153,7 @@ GEM
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
coffee-script-source (1.9.0)
colored (1.2)
colorize (0.7.5)
cookiejar (0.3.2)
@@ -178,15 +176,15 @@ GEM
eventmachine (>= 1.0.0.beta.4)
email_validator (1.5.0)
activemodel
ember-data-source (1.0.0.beta.12)
ember-source
ember-rails (0.15.1)
ember-data-source (1.0.0.beta.14.1)
ember-source (~> 1.8)
ember-rails (0.16.3)
active_model_serializers
barber (>= 0.4.1)
barber (>= 0.6.0)
ember-data-source (>= 1.0.0.beta.5)
ember-source (>= 1.1.0)
execjs (>= 1.2)
handlebars-source (> 1.0.0)
handlebars-source (> 1.0.0, < 3)
jquery-rails (>= 1.0.17)
railties (>= 3.1)
ember-source (1.8.1)
@@ -196,62 +194,62 @@ GEM
execjs
tilt
ember_script-source (0.0.14)
emblem-rails (0.2.1)
emblem-rails (0.2.2)
barber-emblem (~> 0.1.1)
ember-rails (>= 0.14.0)
emblem-source (0.3.17)
emblem-source (0.3.18)
erubis (2.7.0)
eventmachine (1.0.4)
execjs (2.2.2)
eventmachine (1.0.7)
execjs (2.3.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faraday (0.9.0)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
faye (1.0.3)
faye (1.1.0)
cookiejar (>= 0.3.0)
em-http-request (>= 0.3.0)
eventmachine (>= 0.12.0)
faye-websocket (>= 0.7.0)
faye-websocket (>= 0.9.1)
multi_json (>= 1.0.0)
rack (>= 1.0.0)
websocket-driver (>= 0.3.0)
websocket-driver (>= 0.5.1)
faye-websocket (0.9.2)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.9.6)
font-awesome-rails (4.2.0.0)
font-awesome-rails (4.3.0.0)
railties (>= 3.2, < 5.0)
foundation-rails (5.5.0.0)
foundation-rails (5.5.1.0)
railties (>= 3.1.0)
sass (>= 3.2.0, < 3.4)
sass (>= 3.3.0, < 3.5)
fuubar (2.0.0)
rspec (~> 3.0)
ruby-progressbar (~> 1.4)
gherkin (2.12.2)
multi_json (~> 1.3)
globalid (0.3.0)
globalid (0.3.3)
activesupport (>= 4.1.0)
handlebars-source (1.3.0)
hashie (3.3.2)
hashie (3.4.0)
hike (1.2.3)
http_parser.rb (0.6.0)
i18n (0.7.0)
iso_country_codes (0.6.1)
jquery-rails (4.0.1)
jquery-rails (4.0.3)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0.beta)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.3)
railties (>= 3.2.16)
js-routes (0.9.9)
js-routes (1.0.0)
railties (>= 3.2)
sprockets-rails
json (1.8.2)
jwt (1.2.0)
kaminari (0.16.1)
jwt (1.2.1)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
launchy (2.4.3)
@@ -264,7 +262,7 @@ GEM
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (1.25.1)
mini_magick (4.0.1)
mini_magick (4.0.4)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.10.1)
@@ -272,8 +270,8 @@ GEM
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
nokogiri (1.6.5)
net-ssh (2.9.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
@@ -304,24 +302,24 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.2)
pry-rails (0.3.3)
pry (>= 0.9.10)
quiet_assets (1.0.3)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.0)
rack-cors (0.3.0)
rack-cors (0.3.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.0.rc2)
actionmailer (= 4.2.0.rc2)
actionpack (= 4.2.0.rc2)
actionview (= 4.2.0.rc2)
activejob (= 4.2.0.rc2)
activemodel (= 4.2.0.rc2)
activerecord (= 4.2.0.rc2)
activesupport (= 4.2.0.rc2)
rails (4.2.0)
actionmailer (= 4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
activemodel (= 4.2.0)
activerecord (= 4.2.0)
activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0.rc2)
railties (= 4.2.0)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -331,52 +329,53 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
railties (4.2.0.rc2)
actionpack (= 4.2.0.rc2)
activesupport (= 4.2.0.rc2)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rdoc (4.2.0)
json (~> 1.4)
responders (2.0.2)
railties (>= 4.2.0.alpha, < 5)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rest-client (1.6.8)
mime-types (~> 1.16)
rdoc (>= 2.4.2)
rqrcode (0.4.2)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
rspec (3.2.0)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-core (3.2.0)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-support (~> 3.2.0)
rspec-its (1.1.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
rspec-mocks (3.2.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-rails (3.2.0)
actionpack (>= 3.0, <= 4.2)
activesupport (>= 3.0, <= 4.2)
railties (>= 3.0, <= 4.2)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.1)
ruby-progressbar (1.7.1)
rubyzip (1.1.6)
rubyzip (1.1.7)
safe_yaml (1.0.4)
sass (3.3.14)
sass-rails (5.0.0.beta1)
sass (3.4.11)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2)
sprockets (~> 2.12)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
selenium-webdriver (2.44.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
@@ -387,7 +386,7 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slim (3.0.1)
slim (3.0.2)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slim-rails (3.0.1)
@@ -397,7 +396,7 @@ GEM
railties (>= 3.1, < 5.0)
slim (~> 3.0)
slop (3.6.0)
spring (1.2.0)
spring (1.3.1)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (2.12.3)
@@ -405,7 +404,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.2)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
@@ -424,7 +423,7 @@ GEM
rspec (>= 2.14.0, < 4.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.6.0)
uglifier (2.7.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
@@ -450,8 +449,7 @@ PLATFORMS
DEPENDENCIES
active_decorator
active_model_serializers (= 0.9.0)
bootstrap-sass (~> 2.3)
bourbon (= 4.0.2)
bourbon
capistrano (~> 3.0)
capistrano-local-precompile
capistrano-rails (~> 1.1)
@@ -485,11 +483,11 @@ DEPENDENCIES
pry-rails
quiet_assets
rack-cors
rails (= 4.2.0.rc2)
rails (= 4.2.0)
rqrcode
rspec-its
rspec-rails
sass-rails (= 5.0.0.beta1)
sass-rails (~> 5.0.0)
selenium-webdriver
simplecov
simply_stored!