Skip to content

Commit

Permalink
Bump angularjs-rails from 1.5.5 to 1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] authored Mar 25, 2021
1 parent 120a2c4 commit 4bf7d72
Show file tree
Hide file tree
Showing 2 changed files with 166 additions and 330 deletions.
61 changes: 19 additions & 42 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,24 @@ source 'https://rubygems.org'
ruby "2.4.4"
git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

plugin 'bootboot', '~> 0.1.1' unless Bundler.settings[:frozen]
Plugin.__send__(:load_plugin, 'bootboot') if Plugin.installed?('bootboot')
gem 'rails', '~> 5.0.0'

if ENV['DEPENDENCIES_NEXT']
enable_dual_booting if Plugin.installed?('bootboot')

# This will only be loaded when running
# bundler command prefixed with `DEPENDENCIES_NEXT=1
gem 'rails', '> 5.0', '< 5.1'

gem 'activemerchant', '>= 1.78.0'
gem 'angular-rails-templates', '>= 0.3.0', '< 1.1.0'
gem 'awesome_nested_set'
gem 'rails-controller-testing'
gem 'ransack', '2.3.0'
gem 'responders'
else
gem 'rails', '~> 4.2'

gem 'activemerchant', '~> 1.78.0'
gem 'angular-rails-templates', '~> 0.3.0'
gem 'awesome_nested_set', '~> 3.4.0'
gem 'ransack', '~> 1.8.10'
gem 'responders', '~> 2.0'

gem 'db2fog'
gem 'unicorn'

group :test do
gem 'test_after_commit' # needed to test Devise callbacks
end
end
gem 'activemerchant', '>= 1.78.0'
gem 'angular-rails-templates', '>= 0.3.0'
gem 'awesome_nested_set'
gem 'ransack', '2.3.0'
gem 'responders'
gem 'sass', '<= 4.7.1'
gem 'sass-rails', '< 6.0.0'

gem 'i18n'
gem 'i18n-js', '~> 3.8.1'
gem 'i18n-js', '~> 3.8.2'
gem 'rails-i18n'
gem 'rails_safe_tasks', '~> 1.0'

gem "activerecord-import"
gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-5"
gem "fog-aws", ">= 0.6.0"

gem "catalog", path: "./engines/catalog"
gem 'dfc_provider', path: './engines/dfc_provider'
Expand All @@ -53,11 +32,11 @@ gem 'activerecord-postgresql-adapter'
gem 'pg', '~> 0.21.0'

gem 'acts_as_list', '0.9.19'
gem 'cancancan', '~> 1.7.0'
gem 'cancancan', '~> 1.15.0'
gem 'ffaker'
gem 'highline', '2.0.3' # Necessary for the install generator
gem 'json'
gem 'monetize', '~> 1.10'
gem 'monetize', '~> 1.11'
gem 'paranoia', '~> 2.4'
gem 'state_machines-activerecord'
gem 'stringex', '~> 2.8.5'
Expand All @@ -69,7 +48,7 @@ gem 'devise'
gem 'devise-encryptable'
gem 'devise-token_authenticatable'
gem 'jwt', '~> 2.2'
gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect

gem 'daemons'
gem 'delayed_job_active_record'
Expand All @@ -78,7 +57,7 @@ gem 'delayed_job_web'
gem 'kaminari', '~> 1.2.1'

gem 'andand'
gem 'angularjs-rails', '1.5.5'
gem 'angularjs-rails', '1.8.0'
gem 'aws-sdk', '1.67.0'
gem 'bugsnag'
gem 'haml'
Expand All @@ -89,7 +68,7 @@ gem 'actionpack-action_caching'
# AMS is deprecated, we will introduce an alternative at some point
gem "active_model_serializers", "0.8.4"
gem 'activerecord-session_store'
gem 'acts-as-taggable-on', '~> 4.0'
gem 'acts-as-taggable-on', '~> 7.0'
gem 'angularjs-file-upload-rails', '~> 2.4.1'
gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
gem 'dalli'
Expand All @@ -104,7 +83,7 @@ gem 'roadie-rails', '~> 1.3.0'

gem 'combine_pdf'
gem 'wicked_pdf'
gem 'wkhtmltopdf-binary'
gem 'wkhtmltopdf-binary', '0.12.5' # We need to upgrade our CI before we can bump this :/

gem 'immigrant'
gem 'roo', '~> 2.8.3'
Expand All @@ -116,15 +95,12 @@ gem 'test-unit', '~> 3.4'
gem 'coffee-rails', '~> 4.2.2'
gem 'compass-rails'

gem 'libv8', '< 8'
gem 'mini_racer', '0.2.15'
gem 'mini_racer', '0.3.1'

gem 'uglifier', '>= 1.0.3'

gem 'angular_rails_csrf'
gem 'foundation-icons-sass-rails'
gem 'sass', '<= 4.7.1'
gem 'sass-rails', '< 6.0.0'

gem 'foundation-rails', '= 5.5.2.1'

Expand Down Expand Up @@ -168,6 +144,7 @@ group :test do
gem 'simplecov', require: false
gem 'test-prof'
gem 'webmock'
gem 'rails-controller-testing'
# See spec/spec_helper.rb for instructions
# gem 'perftools.rb'
end
Expand Down
Loading

0 comments on commit 4bf7d72

Please sign in to comment.