Merge pull request #496 from openSNP/update-gems

Update gems
This commit is contained in:
Philipp Bayer
2018-04-09 10:17:12 +08:00
committed by GitHub
4 changed files with 138 additions and 135 deletions

View File

@@ -4,7 +4,7 @@ AllCops:
Rails:
Enabled: true
Style/DotPosition:
Layout/DotPosition:
EnforcedStyle: leading
Style/StringLiterals:
@@ -16,9 +16,6 @@ Style/Documentation:
Style/IfUnlessModifier:
Enabled: false
Style/TrailingCommaInLiteral:
Enabled: false
# Only relevant for Rails 5.
Rails/HttpPositionalArguments:
Enabled: false

View File

@@ -19,7 +19,7 @@ gem 'mendeley', git: 'https://github.com/tsujigiri/mendeley', branch: 'paging_se
gem 'plos', require: false
# DB
gem 'pg'
gem 'pg', '<1' # Unpin when updating Rails to 5.x
gem 'activerecord-import', '>= 0.4.0'
gem 'composite_primary_keys', '~> 8.0'
gem 'pg_search'

View File

@@ -24,48 +24,48 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
actionmailer (4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
actionpack (4.2.10)
actionview (= 4.2.10)
activesupport (= 4.2.10)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.8)
activesupport (= 4.2.8)
actionview (4.2.10)
activesupport (= 4.2.10)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
activejob (4.2.10)
activesupport (= 4.2.10)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
activemodel (4.2.10)
activesupport (= 4.2.10)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
activerecord (4.2.10)
activemodel (= 4.2.10)
activesupport (= 4.2.10)
arel (~> 6.0)
activerecord-import (0.18.3)
activerecord-import (0.22.0)
activerecord (>= 3.2)
activesupport (4.2.8)
activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (6.0.4)
authlogic (3.6.0)
activerecord (>= 3.2, < 5.2)
activesupport (>= 3.2, < 5.2)
authlogic (4.0.1)
activerecord (>= 4.2, < 5.3)
activesupport (>= 4.2, < 5.3)
request_store (~> 1.0)
scrypt (>= 1.2, < 4.0)
bcrypt (3.1.11)
@@ -78,29 +78,27 @@ GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
capybara (2.14.0)
capybara (2.18.0)
addressable
mime-types (>= 1.16)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
xpath (>= 2.0, < 4.0)
chronic (0.10.2)
climate_control (0.2.0)
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.1)
composite_primary_keys (8.1.5)
coderay (1.1.2)
composite_primary_keys (8.1.6)
activerecord (~> 4.2.0)
concurrent-ruby (1.0.5)
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.3)
database_cleaner (1.6.1)
database_cleaner (1.6.2)
diff-lcs (1.3)
docile (1.1.5)
docile (1.3.0)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.2.1)
@@ -110,26 +108,26 @@ GEM
dynamic_form (1.1.4)
erubis (2.7.0)
execjs (2.7.0)
factory_girl (4.8.0)
factory_girl (4.9.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0)
railties (>= 3.0.0)
faraday (0.13.1)
faraday (0.14.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
ffi (1.9.23)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
formatador (0.2.5)
friendly_id (5.2.1)
friendly_id (5.2.3)
activerecord (>= 4.0.0)
globalid (0.4.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
guard (2.14.1)
guard (2.14.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (~> 1.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
@@ -140,11 +138,11 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hashdiff (0.3.4)
highline (1.7.8)
hashdiff (0.3.7)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.9.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
@@ -160,25 +158,27 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
lograge (0.5.1)
actionpack (>= 4, < 5.2)
activesupport (>= 4, < 5.2)
railties (>= 4, < 5.2)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.12)
mail (2.6.5)
mime-types (>= 1.16, < 4)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
mediawiki-gateway (1.1.0)
rest-client (~> 1.7)
metaclass (0.0.4)
method_source (0.8.2)
method_source (0.9.0)
mime-types (2.99.3)
mimemagic (0.3.2)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
mocha (1.2.1)
mocha (1.5.0)
metaclass (~> 0.0.1)
multipart-post (2.0.0)
nenv (0.3.0)
@@ -186,7 +186,7 @@ GEM
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (4.1.0)
net-ssh (4.2.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
netrc (0.11.0)
@@ -197,97 +197,97 @@ GEM
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
paperclip (5.2.1)
paperclip (6.0.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
pg (0.20.0)
pg_search (2.0.1)
terrapin (~> 0.6.0)
pg (0.21.0)
pg_search (2.1.2)
activerecord (>= 4.2)
activesupport (>= 4.2)
arel (>= 6)
plos (0.0.7)
nokogiri
rest-client
poltergeist (1.15.0)
poltergeist (1.17.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
power_assert (1.0.2)
pry (0.10.4)
power_assert (1.1.1)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (2.0.5)
public_suffix (3.0.2)
rack (1.6.9)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
rails (4.2.10)
actionmailer (= 4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
activemodel (= 4.2.10)
activerecord (= 4.2.10)
activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.8)
railties (= 4.2.10)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails3-generators (1.0.0)
railties (>= 3.0.0)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
railties (4.2.10)
actionpack (= 4.2.10)
activesupport (= 4.2.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.8)
ffi (>= 0.5.0)
recaptcha (4.3.1)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
recaptcha (4.8.0)
json
redis (3.3.3)
redis (4.0.1)
ref (2.0.0)
request_store (1.3.2)
request_store (1.4.1)
rack (>= 1.4)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-mocks (3.6.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-rails (3.6.0)
rspec-support (~> 3.7.0)
rspec-rails (3.7.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
ruby_dep (1.5.0)
rubyzip (1.2.1)
rvm-capistrano (1.4.4)
@@ -297,8 +297,12 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
sass (3.4.23)
sass-rails (5.0.6)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
@@ -306,22 +310,22 @@ GEM
tilt (>= 1.1, < 3)
scrypt (3.0.5)
ffi-compiler (>= 1.0, < 2.0)
sentry-raven (2.7.1)
sentry-raven (2.7.2)
faraday (>= 0.7.6, < 1.0)
shellany (0.0.1)
shoulda-context (1.2.2)
sidekiq (5.0.0)
sidekiq (5.1.3)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.3, >= 3.3.3)
redis (>= 3.3.5, < 5)
sidekiq-limit_fetch (3.4.0)
sidekiq (>= 4)
simplecov (0.13.0)
docile (~> 1.1.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
simplecov-html (0.10.2)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
@@ -329,51 +333,53 @@ GEM
slim (1.3.9)
temple (~> 0.6.3)
tilt (~> 1.3, >= 1.3.3)
slop (3.6.0)
spring (2.0.1)
slop (4.6.2)
spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.6.10)
test-unit (3.2.3)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
test-unit (3.2.7)
power_assert
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
thor (0.20.0)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.8.1)
tzinfo (1.2.4)
timecop (0.9.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (3.2.0)
uglifier (4.1.8)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.5)
uuidtools (2.1.5)
vcr (3.0.3)
webmock (3.0.1)
vcr (4.0.0)
webmock (3.3.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.6.5)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
whenever (0.9.7)
websocket-extensions (0.1.3)
whenever (0.10.0)
chronic (>= 0.6.3)
will_paginate (3.1.5)
will_paginate (3.1.6)
will_paginate-bootstrap (1.0.1)
will_paginate (>= 3.0.3)
xpath (2.0.0)
nokogiri (~> 1.3)
xpath (3.0.0)
nokogiri (~> 1.8)
yajl-ruby (1.3.1)
PLATFORMS
@@ -405,7 +411,7 @@ DEPENDENCIES
mocha
nested_form!
paperclip
pg
pg (< 1)
pg_search
plos
poltergeist

View File

@@ -9,7 +9,7 @@ class UserSessionsController < ApplicationController
end
def create
@user_session = UserSession.new(user_session_params)
@user_session = UserSession.new(user_session_params.to_h)
if @user_session.save
flash[:notice] = 'Login successful!'
redirect_to @user_session.user