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

Upgrades and simple_form dependency removal

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-12-11 14:37:09 +01:00
parent 1a3f528731
commit 711f878a3a
16 changed files with 8134 additions and 8348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+80 -89
View File
@@ -1,12 +1,12 @@
GIT
remote: git://github.com/bterkuile/cmtool.git
revision: b5a24fd34697160e80394e74fdb1ea15c8f1f864
revision: a4bef656ccf3ad434f13e458e2c96abe8636cfa0
specs:
cmtool (1.0.0)
bourbon
email_validator
haml-rails
jquery-rails
paperclip
slim-rails
tinymce-rails
@@ -59,46 +59,46 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.0.beta4)
actionpack (= 4.2.0.beta4)
actionview (= 4.2.0.beta4)
activejob (= 4.2.0.beta4)
actionmailer (4.2.0.rc2)
actionpack (= 4.2.0.rc2)
actionview (= 4.2.0.rc2)
activejob (= 4.2.0.rc2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.4)
actionpack (4.2.0.beta4)
actionview (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
rack (~> 1.6.0.beta)
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)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0.beta4)
activesupport (= 4.2.0.beta4)
actionview (4.2.0.rc2)
activesupport (= 4.2.0.rc2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
active_decorator (0.3.4)
active_model_serializers (0.9.0)
active_model_serializers (0.9.1)
activemodel (>= 3.2)
activejob (4.2.0.beta4)
activesupport (= 4.2.0.beta4)
activejob (4.2.0.rc2)
activesupport (= 4.2.0.rc2)
globalid (>= 0.3.0)
activemodel (4.2.0.beta4)
activesupport (= 4.2.0.beta4)
activemodel (4.2.0.rc2)
activesupport (= 4.2.0.rc2)
builder (~> 3.1)
activerecord (4.2.0.beta4)
activemodel (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
arel (>= 6.0.0.beta2, < 6.1)
activesupport (4.2.0.beta4)
activerecord (4.2.0.rc2)
activemodel (= 4.2.0.rc2)
activesupport (= 4.2.0.rc2)
arel (~> 6.0)
activesupport (4.2.0.rc2)
i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
arel (6.0.0.beta2)
arel (6.0.0)
barber (0.5.0)
ember-source
execjs
@@ -107,7 +107,7 @@ GEM
barber (>= 0.4.1)
emblem-source
bcrypt (3.1.9)
binding_of_caller (0.7.3.pre1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
@@ -115,7 +115,8 @@ GEM
sass (~> 3.3)
thor
builder (3.2.2)
capistrano (3.2.1)
capistrano (3.3.4)
capistrano-stats (~> 1.1.0)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
@@ -128,18 +129,23 @@ GEM
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano-stats (1.1.0)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-screenshot (1.0.3)
capybara (>= 1.0, < 3)
colored
launchy
capybara-webkit (1.3.1)
capybara (>= 2.0.2, < 2.5.0)
json
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.4)
cocaine (0.5.5)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
coffee-rails (4.1.0)
@@ -149,7 +155,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.8.0)
colorize (0.7.3)
colored (1.2)
colorize (0.7.4)
cookiejar (0.3.2)
couchrest (1.2.0)
mime-types (~> 1.15)
@@ -158,9 +165,6 @@ GEM
debug_inspector (0.0.2)
diff-lcs (1.2.5)
docile (1.1.5)
dotenv (0.11.1)
dotenv-deployment (~> 0.0.2)
dotenv-deployment (0.0.2)
em-http-request (1.1.2)
addressable (>= 2.3.4)
cookiejar
@@ -169,9 +173,9 @@ GEM
http_parser.rb (>= 0.6.0)
em-socksify (0.3.0)
eventmachine (>= 1.0.0.beta.4)
email_validator (1.4.0)
email_validator (1.5.0)
activemodel
ember-data-source (1.0.0.beta.11)
ember-data-source (1.0.0.beta.12)
ember-source
ember-rails (0.15.0)
active_model_serializers
@@ -216,9 +220,6 @@ GEM
websocket-driver (>= 0.4.0)
font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0)
foreman (0.75.0)
dotenv (~> 0.11.1)
thor (~> 0.19.1)
foundation-rails (5.4.5.0)
railties (>= 3.1.0)
sass (>= 3.2.0)
@@ -229,35 +230,29 @@ GEM
multi_json (~> 1.3)
globalid (0.3.0)
activesupport (>= 4.1.0)
haml (4.0.5)
tilt
haml-rails (0.5.3)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0)
railties (>= 4.0.1)
handlebars-source (1.3.0)
hashie (3.3.1)
hashie (3.3.2)
hike (1.2.3)
http_parser.rb (0.6.0)
i18n (0.7.0.beta1)
iso_country_codes (0.6.1)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
jquery-rails (4.0.0)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0.beta, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.2)
jquery-ui-rails (5.0.3)
railties (>= 3.2.16)
js-routes (0.9.9)
railties (>= 3.2)
sprockets-rails
json (1.8.1)
jwt (1.0.0)
jwt (1.2.0)
kaminari (0.16.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.2.0)
letter_opener (1.3.0)
launchy (~> 2.2)
loofah (2.0.1)
nokogiri (>= 1.5.9)
@@ -265,7 +260,7 @@ GEM
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (1.25.1)
mini_magick (4.0.0)
mini_magick (4.0.1)
mini_portile (0.6.1)
minitest (5.4.3)
multi_json (1.10.1)
@@ -274,7 +269,7 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
nokogiri (1.6.4.1)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
@@ -293,7 +288,7 @@ GEM
oauth2 (~> 1.0)
omniauth (~> 1.2)
orm_adapter (0.5.0)
paperclip (4.2.0)
paperclip (4.2.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
@@ -306,36 +301,36 @@ GEM
pry (>= 0.9.10)
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
rack (1.6.0.beta)
rack (1.6.0.beta2)
rack-cors (0.2.9)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.2.0.beta4)
actionmailer (= 4.2.0.beta4)
actionpack (= 4.2.0.beta4)
actionview (= 4.2.0.beta4)
activejob (= 4.2.0.beta4)
activemodel (= 4.2.0.beta4)
activerecord (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
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)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0.beta4)
sprockets-rails (~> 3.0.0.beta1)
railties (= 4.2.0.rc2)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.4)
rails-dom-testing (1.0.5)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
railties (4.2.0.beta4)
actionpack (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
railties (4.2.0.rc2)
actionpack (= 4.2.0.rc2)
activesupport (= 4.2.0.rc2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rdoc (4.1.2)
rake (10.4.2)
rdoc (4.2.0)
json (~> 1.4)
responders (2.0.2)
railties (>= 4.2.0.alpha, < 5)
@@ -367,15 +362,12 @@ GEM
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
ruby-progressbar (1.7.0)
sass (3.4.8)
sass (3.4.9)
sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2)
sprockets (~> 2.12)
sprockets-rails (>= 2.0, < 4.0)
simple_form (3.0.2)
actionpack (~> 4.0)
activemodel (~> 4.0)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json (~> 1.0)
@@ -390,18 +382,18 @@ GEM
railties (>= 3.0, < 4.2)
slim (~> 2.0)
slop (3.6.0)
spring (1.1.3)
spring-commands-rspec (1.0.2)
spring (1.2.0)
spring-commands-rspec (1.0.3)
spring (>= 0.9.1)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (3.0.0.beta1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (~> 2.8)
sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sshkit (1.5.1)
colorize
net-scp (>= 1.1.2)
@@ -417,14 +409,14 @@ GEM
rspec (>= 2.14.0, < 4.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
uglifier (2.6.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
rack (>= 1.0)
web-console (2.0.0.beta4)
web-console (2.0.0)
activemodel (~> 4.0)
binding_of_caller (= 0.7.3.pre1)
binding_of_caller (>= 0.7.2)
railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0)
websocket-driver (0.4.0)
@@ -442,6 +434,7 @@ DEPENDENCIES
capistrano (~> 3.0)
capistrano-rails (~> 1.1)
capistrano-rvm (~> 0.1)
capybara-screenshot
capybara-webkit
cmtool!
coffee-rails
@@ -449,13 +442,12 @@ DEPENDENCIES
devise!
devise_simply_stored!
ember-rails
ember-source
ember-source (= 1.8.1)
ember_script-rails!
emblem-rails
factory_girl_rails
faye
font-awesome-rails
foreman
foundation-rails
fuubar
iso_country_codes
@@ -471,12 +463,11 @@ DEPENDENCIES
pry-rails
quiet_assets
rack-cors
rails (= 4.2.0.beta4)
rails (= 4.2.0.rc2)
rqrcode
rspec-its
rspec-rails
sass-rails (= 5.0.0.beta1)
simple_form
simplecov
simply_stored!
slim-rails
@@ -484,4 +475,4 @@ DEPENDENCIES
spring-commands-rspec
turnip
uglifier (>= 1.0.3)
web-console (~> 2.0.0.beta3)
web-console (~> 2.0.0)