Bundle update
This commit is contained in:
wvengen
parent
6105e62597
commit
f5a7c4c90a
3 changed files with 16 additions and 16 deletions
1
Gemfile
1
Gemfile
|
|
@ -107,7 +107,6 @@ group :test do
|
||||||
# need to include rspec components before i18n-spec or rake fails in test environment
|
# need to include rspec components before i18n-spec or rake fails in test environment
|
||||||
gem 'rspec-core', '~> 3.2'
|
gem 'rspec-core', '~> 3.2'
|
||||||
gem 'rspec-rerun'
|
gem 'rspec-rerun'
|
||||||
gem 'rspec-legacy_formatters'
|
|
||||||
gem 'i18n-spec'
|
gem 'i18n-spec'
|
||||||
# code coverage
|
# code coverage
|
||||||
gem 'simplecov', require: false
|
gem 'simplecov', require: false
|
||||||
|
|
|
||||||
30
Gemfile.lock
30
Gemfile.lock
|
|
@ -90,7 +90,7 @@ GEM
|
||||||
bootstrap-datepicker-rails (1.4.0)
|
bootstrap-datepicker-rails (1.4.0)
|
||||||
railties (>= 3.0)
|
railties (>= 3.0)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
bullet (4.14.6)
|
bullet (4.14.7)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
uniform_notifier (~> 1.9.0)
|
uniform_notifier (~> 1.9.0)
|
||||||
callsite (0.0.11)
|
callsite (0.0.11)
|
||||||
|
|
@ -186,7 +186,7 @@ GEM
|
||||||
http-cookie (1.0.2)
|
http-cookie (1.0.2)
|
||||||
domain_name (~> 0.5)
|
domain_name (~> 0.5)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
i18n-js (3.0.0.rc9)
|
i18n-js (3.0.0.rc10)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
i18n-spec (0.6.0)
|
i18n-spec (0.6.0)
|
||||||
iso
|
iso
|
||||||
|
|
@ -227,9 +227,9 @@ GEM
|
||||||
rack-contrib (~> 1.1)
|
rack-contrib (~> 1.1)
|
||||||
railties (>= 3.0.0, < 5.0.0)
|
railties (>= 3.0.0, < 5.0.0)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.5)
|
mime-types (2.6.1)
|
||||||
mini_portile (0.6.2)
|
mini_portile (0.6.2)
|
||||||
minitest (5.6.1)
|
minitest (5.7.0)
|
||||||
mono_logger (1.1.0)
|
mono_logger (1.1.0)
|
||||||
multi_json (1.11.0)
|
multi_json (1.11.0)
|
||||||
mysql2 (0.3.18)
|
mysql2 (0.3.18)
|
||||||
|
|
@ -360,16 +360,17 @@ GEM
|
||||||
rspec-expectations (~> 3.2.0)
|
rspec-expectations (~> 3.2.0)
|
||||||
rspec-mocks (~> 3.2.0)
|
rspec-mocks (~> 3.2.0)
|
||||||
rspec-support (~> 3.2.0)
|
rspec-support (~> 3.2.0)
|
||||||
rspec-rerun (0.3.0)
|
rspec-rerun (1.0.0)
|
||||||
rspec
|
rspec (~> 3.0)
|
||||||
|
rspec-legacy_formatters
|
||||||
rspec-support (3.2.2)
|
rspec-support (3.2.2)
|
||||||
ruby-ole (1.2.11.8)
|
ruby-ole (1.2.11.8)
|
||||||
ruby-prof (0.15.8)
|
ruby-prof (0.15.8)
|
||||||
ruby-units (1.4.5)
|
ruby-units (1.4.5)
|
||||||
ruby_parser (3.6.6)
|
ruby_parser (3.7.0)
|
||||||
sexp_processor (~> 4.1)
|
sexp_processor (~> 4.1)
|
||||||
rubyzip (1.1.7)
|
rubyzip (1.1.7)
|
||||||
sass (3.4.13)
|
sass (3.4.14)
|
||||||
sass-rails (5.0.3)
|
sass-rails (5.0.3)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
|
|
@ -383,12 +384,12 @@ GEM
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rubyzip (~> 1.0)
|
rubyzip (~> 1.0)
|
||||||
websocket (~> 1.0)
|
websocket (~> 1.0)
|
||||||
sexp_processor (4.5.1)
|
sexp_processor (4.6.0)
|
||||||
simple-navigation (3.14.0)
|
simple-navigation (3.14.0)
|
||||||
activesupport (>= 2.3.2)
|
activesupport (>= 2.3.2)
|
||||||
simple-navigation-bootstrap (1.0.0)
|
simple-navigation-bootstrap (1.0.2)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
simple-navigation (>= 3.7.0)
|
simple-navigation (>= 3.7.0, < 4.0.0)
|
||||||
simple_form (3.1.0)
|
simple_form (3.1.0)
|
||||||
actionpack (~> 4.0)
|
actionpack (~> 4.0)
|
||||||
activemodel (~> 4.0)
|
activemodel (~> 4.0)
|
||||||
|
|
@ -407,9 +408,9 @@ GEM
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
spreadsheet (1.0.3)
|
spreadsheet (1.0.3)
|
||||||
ruby-ole (>= 1.0)
|
ruby-ole (>= 1.0)
|
||||||
sprockets (3.0.3)
|
sprockets (3.1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
sprockets-rails (2.3.0)
|
sprockets-rails (2.3.1)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
|
|
@ -430,7 +431,7 @@ GEM
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.5)
|
thread_safe (0.3.5)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
tins (1.5.1)
|
tins (1.5.2)
|
||||||
ttfunk (1.4.0)
|
ttfunk (1.4.0)
|
||||||
twitter-bootstrap-rails (2.2.8)
|
twitter-bootstrap-rails (2.2.8)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
|
|
@ -523,7 +524,6 @@ DEPENDENCIES
|
||||||
roo (~> 2.0.0)
|
roo (~> 2.0.0)
|
||||||
roo-xls
|
roo-xls
|
||||||
rspec-core (~> 3.2)
|
rspec-core (~> 3.2)
|
||||||
rspec-legacy_formatters
|
|
||||||
rspec-rails
|
rspec-rails
|
||||||
rspec-rerun
|
rspec-rerun
|
||||||
ruby-prof
|
ruby-prof
|
||||||
|
|
|
||||||
1
Rakefile
1
Rakefile
|
|
@ -4,5 +4,6 @@
|
||||||
|
|
||||||
require File.expand_path('../config/application', __FILE__)
|
require File.expand_path('../config/application', __FILE__)
|
||||||
require 'rake'
|
require 'rake'
|
||||||
|
require 'rspec-rerun/tasks'
|
||||||
|
|
||||||
Foodsoft::Application.load_tasks
|
Foodsoft::Application.load_tasks
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue