X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6fe8e52020d421797306e5c6536afbcee761510a..d394bc5c81dc488fc67cf3402e1074fafa1d9bcd:/apps/workbench/Gemfile diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile index b62df6c021..24bfba383f 100644 --- a/apps/workbench/Gemfile +++ b/apps/workbench/Gemfile @@ -4,10 +4,10 @@ source 'https://rubygems.org' -gem 'rails', '~> 4.2.0' -gem 'arvados', '>= 0.1.20150511150219' +gem 'rails', '~> 5.0.0' +gem 'arvados', git: 'https://github.com/arvados/arvados.git', glob: 'sdk/ruby/arvados.gemspec' -gem 'activerecord-nulldb-adapter' +gem 'activerecord-nulldb-adapter', git: 'https://github.com/arvados/nulldb' gem 'multi_json' gem 'oj' gem 'sass' @@ -24,7 +24,7 @@ gem 'coffee-rails' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails' + gem 'sassc-rails' gem 'uglifier', '~> 2.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes @@ -41,15 +41,14 @@ end group :test, :diagnostics, :performance do gem 'minitest', '~> 5.10.3' - # Selenium-webdriver 3.x is producing problems like the one described here: - # https://stackoverflow.com/questions/41310586/ruby-selenium-webdriver-unable-to-find-mozilla-geckodriver - gem 'selenium-webdriver', '~> 2.53.1' + gem 'selenium-webdriver', '~> 3' gem 'capybara', '~> 2.5.0' gem 'poltergeist', '~> 1.5.1' gem 'headless', '~> 1.0.2' end group :test, :performance do + gem 'byebug' gem 'rails-perftest' gem 'ruby-prof' gem 'rvm-capistrano' @@ -59,10 +58,11 @@ group :test, :performance do gem 'simplecov', '~> 0.7', require: false gem 'simplecov-rcov', require: false gem 'mocha', require: false + gem 'rails-controller-testing' end gem 'jquery-rails' -gem 'bootstrap-sass', '~> 3.1.0' +gem 'bootstrap-sass', '~> 3.4.1' gem 'bootstrap-x-editable-rails' gem 'bootstrap-tab-history-rails' @@ -70,7 +70,12 @@ gem 'angularjs-rails', '~> 1.3.8' gem 'less' gem 'less-rails' -gem 'wiselinks' + +# Wiselinks hasn't been updated for many years and it's using deprecated methods +# Use our own Wiselinks fork until this PR is accepted: +# https://github.com/igor-alexandrov/wiselinks/pull/116 +# gem 'wiselinks', git: 'https://github.com/arvados/wiselinks.git', branch: 'rails-5.1-compatibility' + gem 'sshkey' # To use ActiveModel has_secure_password @@ -85,9 +90,6 @@ gem 'sshkey' # Deploy with Capistrano # gem 'capistrano' -# To use debugger -#gem 'byebug' - gem 'passenger', :group => :production gem 'andand' gem 'RedCloth' @@ -96,7 +98,7 @@ gem 'piwik_analytics' gem 'httpclient', '~> 2.5' # This fork has Rails 4 compatible routes -gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails' +gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails' gem "deep_merge", :require => 'deep_merge/rails_compat' @@ -109,3 +111,7 @@ gem 'logstash-event' gem 'safe_yaml' gem 'npm-rails' + +# arvados-google-api-client and googleauth (and thus arvados) gems +# depend on signet, but signet 0.12 is incompatible with ruby 2.3. +gem 'signet', '< 0.12'