X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6024627680c17a54a24e1bd5d78416cf251562d0..6921ecacf90479af239580e098500300aa498ff3:/apps/workbench/Gemfile diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile index 30c5bfce83..24bfba383f 100644 --- a/apps/workbench/Gemfile +++ b/apps/workbench/Gemfile @@ -5,9 +5,9 @@ source 'https://rubygems.org' gem 'rails', '~> 5.0.0' -gem 'arvados', '>= 0.1.20150511150219' +gem 'arvados', git: 'https://github.com/arvados/arvados.git', glob: 'sdk/ruby/arvados.gemspec' -gem 'activerecord-nulldb-adapter', git: 'https://github.com/curoverse/nulldb' +gem 'activerecord-nulldb-adapter', git: 'https://github.com/arvados/nulldb' gem 'multi_json' gem 'oj' gem 'sass' @@ -62,7 +62,7 @@ group :test, :performance do 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' @@ -74,7 +74,7 @@ gem 'less-rails' # 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/curoverse/wiselinks.git', branch: 'rails-5.1-compatibility' +# gem 'wiselinks', git: 'https://github.com/arvados/wiselinks.git', branch: 'rails-5.1-compatibility' gem 'sshkey' @@ -90,9 +90,6 @@ gem 'sshkey' # Deploy with Capistrano # gem 'capistrano' -# To use debugger -#gem 'byebug' - gem 'passenger', :group => :production gem 'andand' gem 'RedCloth' @@ -101,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' @@ -114,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'