Skip to content

Bump resque, omniauth, capybara, jasmine, alto_guisso_rails, sass-rails, omniauth-openid, resque-scheduler and redis #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump resque, omniauth, capybara, jasmine, alto_guisso_rails, sass-rails, omniauth-openid, resque-scheduler and redis #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ gem 'rails', '~> 4.2.11'
gem "elasticsearch", '~> 1.0.17'
gem 'mysql2', '~> 0.3.17'
gem 'puma', '~> 3.11.4'
gem 'redis', '~> 3.1'
gem "resque", '~> 1.25', :require => "resque/server"
gem 'resque-scheduler', '~> 3.0.0'
gem 'redis', '~> 5.0'
gem "resque", '~> 2.6', :require => "resque/server"
gem 'resque-scheduler', '~> 4.10.2'

# exernal services
gem 'google-api-client', '~> 0.10'
Expand All @@ -20,8 +20,8 @@ gem "nuntium_api", "~> 0.13", :require => "nuntium"
# authentication/authorization
gem 'devise', '~> 3.3'
gem 'cancancan', '~> 1.9'
gem "omniauth", '~> 1.2'
gem "omniauth-openid", '~> 1.0'
gem "omniauth", '~> 2.0'
gem "omniauth-openid", '~> 2.0'
gem 'alto_guisso', :git => "https://github.com/instedd/alto_guisso", branch: 'master'
gem 'alto_guisso_rails', :git => "https://github.com/instedd/alto_guisso_rails", branch: 'master'

Expand Down Expand Up @@ -62,7 +62,7 @@ gem 'jquery-rails', "~> 2.0.2"
gem 'lodash-rails'
gem 'knockoutjs-rails', '~> 3.2.0'
gem 'rails-assets-knockout-sortable', :source => 'https://rails-assets.org'
gem 'sass-rails', '~> 4.0.1'
gem 'sass-rails', '~> 6.0.0'
gem 'uglifier', '>= 2.5.0'

# dependency fixes (to be removed)
Expand All @@ -75,7 +75,7 @@ group :development do
end

group :test do
gem 'capybara', '~> 2.18' # 3.x requires rack 1.6 but rails 4.1 requires 1.5
gem 'capybara', '~> 3.39' # 3.x requires rack 1.6 but rails 4.1 requires 1.5
gem 'database_cleaner'
gem 'faker'
gem 'machinist', '1.0.6'
Expand All @@ -90,7 +90,7 @@ end
group :test, :development do
# gem 'quiet_assets', '~> 1.1.0'
# gem 'guard-jasmine', '~> 2.0.6'
gem 'jasmine', '~> 2.7.0'
gem 'jasmine', '~> 3.8.0'
# gem 'memory_profiler'
# gem 'pry-byebug'
gem 'rspec-rails', '~> 3.4.0'
Expand Down
Loading