Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gem 'jbuilder', '~> 2.5'
# Excel spreadsheet support
gem 'rubyXL', '=3.3.33'
# file upload
gem 'carrierwave', '~> 0.10.0'
gem 'carrierwave', '~> 1.3.2'
# report upload
gem 'sequel'
group :development, :test do
Expand Down
15 changes: 8 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
carrierwave (0.10.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
carrierwave (1.3.2)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
ssrf_filter (~> 1.0)
character_set (1.4.1)
sorted_set (~> 1.0)
childprocess (1.0.1)
Expand All @@ -85,7 +85,7 @@ GEM
execjs
coffee-script-source (1.12.2)
commonjs (0.2.7)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
connection_pool (2.2.3)
crass (1.0.6)
css_parser (1.9.0)
Expand All @@ -112,7 +112,7 @@ GEM
globalid (0.4.2)
activesupport (>= 4.2.0)
httpclient (2.8.3)
i18n (1.8.9)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jbuilder (2.11.2)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -282,6 +282,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
Expand Down Expand Up @@ -341,7 +342,7 @@ DEPENDENCIES
bootstrap_form
byebug
capybara (~> 2.13)
carrierwave (~> 0.10.0)
carrierwave (~> 1.3.2)
client_side_validations
coffee-rails (~> 4.2)
devise
Expand Down