Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ active_record_log_subscriber.rb
/public/webpack
/public/packs-test

config/master.key

.gitattributes
26 changes: 8 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,25 @@ env:
- USE_OFFICIAL_GEM_SOURCE=1
- COVERAGE=true
- RAILS_ENV=test
- CXX=g++-4.9
- PGPORT=5433

addons:
postgresql: "10"
apt:
packages:
- postgresql-10
- postgresql-client-10
- PGPORT=5432
- PGUSER=travis

services:
- redis-server

rvm:
- 2.5.1
- 2.6.4
- 2.6.6
- 2.7.2

sudo: true
dist: trusty
dist: bionic

addons:
postgresql: "10"
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9
- postgresql-10
- postgresql-client-10
- postgresql-contrib-10

before_install:
- sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
Expand All @@ -42,8 +32,8 @@ before_install:

install:
- bundle install
- nvm install 12.10.0 && nvm alias default 12.10.0
- npm install -g npm@6.10.x
- nvm install 14.15.0 && nvm alias default 14.15.0
- npm install -g npm@6.14.x
- npm install -g yarn
- node --version
- npm --version
Expand Down
8 changes: 5 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 5.0.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
gem 'mini_racer', platforms: :ruby
# gem 'mini_racer', git: 'https://github.com/rubyjs/mini_racer', platforms: :ruby

gem 'mini_racer', github: 'rubyjs/mini_racer', branch: 'refs/pull/186/head'

gem 'marked-rails'
gem 'font-awesome-rails', github: "bokmann/font-awesome-rails", branch: "master" #'~> 4.7.0.6'
Expand All @@ -28,7 +30,6 @@ gem 'omniauth-facebook'
gem 'omniauth-github'
gem 'omniauth-google-oauth2'
gem 'redis'
gem 'logster'
gem 'http_accept_language'

# Use jquery as the JavaScript library
Expand All @@ -52,6 +53,7 @@ gem 'pg_search'
gem 'rubyzip', '~> 1.3.0'
gem 'axlsx', '3.0.0.pre'
gem 'axlsx_rails'
gem 'logster'

# Disable for error:
# Rack app error handling request { POST /mini-profiler-resources/results }
Expand All @@ -65,7 +67,7 @@ gem 'axlsx_rails'
# gem 'bcrypt', '~> 3.1.7'

group :development, :test do
gem 'rspec-rails', '~> 4.0.0.beta2'
gem 'rspec-rails', '~> 5.0.1'
gem "pry"
gem 'pry-doc'
gem 'pry-nav'
Expand Down
173 changes: 91 additions & 82 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ GIT
awesome_nested_fields (0.6.5)
rails (> 3.0.0)

GIT
remote: https://github.com/rubyjs/mini_racer.git
revision: b0b35eef0cdc1bd0871b4c5e5bf8163e3056d69d
branch: refs/pull/186/head
specs:
mini_racer (0.3.1)
libv8-node (~> 15.5.1.0.beta1)

GIT
remote: https://github.com/seuros/capistrano-puma.git
revision: d4ac7b9950ddc53835f661c7761ad3e904c48c65
Expand All @@ -25,60 +33,60 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.0)
actionpack (= 6.1.0)
activesupport (= 6.1.0)
actioncable (6.1.3.1)
actionpack (= 6.1.3.1)
activesupport (= 6.1.3.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.0)
actionpack (= 6.1.0)
activejob (= 6.1.0)
activerecord (= 6.1.0)
activestorage (= 6.1.0)
activesupport (= 6.1.0)
actionmailbox (6.1.3.1)
actionpack (= 6.1.3.1)
activejob (= 6.1.3.1)
activerecord (= 6.1.3.1)
activestorage (= 6.1.3.1)
activesupport (= 6.1.3.1)
mail (>= 2.7.1)
actionmailer (6.1.0)
actionpack (= 6.1.0)
actionview (= 6.1.0)
activejob (= 6.1.0)
activesupport (= 6.1.0)
actionmailer (6.1.3.1)
actionpack (= 6.1.3.1)
actionview (= 6.1.3.1)
activejob (= 6.1.3.1)
activesupport (= 6.1.3.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.0)
actionview (= 6.1.0)
activesupport (= 6.1.0)
actionpack (6.1.3.1)
actionview (= 6.1.3.1)
activesupport (= 6.1.3.1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.0)
actionpack (= 6.1.0)
activerecord (= 6.1.0)
activestorage (= 6.1.0)
activesupport (= 6.1.0)
actiontext (6.1.3.1)
actionpack (= 6.1.3.1)
activerecord (= 6.1.3.1)
activestorage (= 6.1.3.1)
activesupport (= 6.1.3.1)
nokogiri (>= 1.8.5)
actionview (6.1.0)
activesupport (= 6.1.0)
actionview (6.1.3.1)
activesupport (= 6.1.3.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.0)
activesupport (= 6.1.0)
activejob (6.1.3.1)
activesupport (= 6.1.3.1)
globalid (>= 0.3.6)
activemodel (6.1.0)
activesupport (= 6.1.0)
activerecord (6.1.0)
activemodel (= 6.1.0)
activesupport (= 6.1.0)
activestorage (6.1.0)
actionpack (= 6.1.0)
activejob (= 6.1.0)
activerecord (= 6.1.0)
activesupport (= 6.1.0)
marcel (~> 0.3.1)
mimemagic (~> 0.3.2)
activesupport (6.1.0)
activemodel (6.1.3.1)
activesupport (= 6.1.3.1)
activerecord (6.1.3.1)
activemodel (= 6.1.3.1)
activesupport (= 6.1.3.1)
activestorage (6.1.3.1)
actionpack (= 6.1.3.1)
activejob (= 6.1.3.1)
activerecord (= 6.1.3.1)
activesupport (= 6.1.3.1)
marcel (~> 1.0.0)
mini_mime (~> 1.0.2)
activesupport (6.1.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -131,7 +139,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
connection_pool (2.2.3)
crass (1.0.6)
devise (4.7.3)
Expand All @@ -153,7 +161,7 @@ GEM
hashie (4.1.0)
htmlentities (4.3.4)
http_accept_language (2.1.1)
i18n (1.8.5)
i18n (1.8.9)
concurrent-ruby (~> 1.0)
jbuilder (2.10.1)
activesupport (>= 5.0.0)
Expand All @@ -167,35 +175,35 @@ GEM
letter_avatar (0.3.8)
letter_opener (1.7.0)
launchy (~> 2.2)
libv8 (8.4.255.0)
logster (2.9.4)
loofah (2.8.0)
libv8-node (15.5.1.0.beta1)
logster (2.9.6)
loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.0)
marked-rails (0.3.2.0)
method_source (0.9.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.1104)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_racer (0.3.1)
libv8 (~> 8.4.255)
minitest (5.14.2)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.0.3)
mini_portile2 (2.5.0)
minitest (5.14.4)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
nio4r (2.5.4)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nio4r (2.5.7)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
oauth (0.5.4)
oauth2 (1.4.4)
faraday (>= 0.8, < 2.0)
Expand Down Expand Up @@ -252,25 +260,26 @@ GEM
public_suffix (4.0.6)
puma (5.1.1)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.1.0)
actioncable (= 6.1.0)
actionmailbox (= 6.1.0)
actionmailer (= 6.1.0)
actionpack (= 6.1.0)
actiontext (= 6.1.0)
actionview (= 6.1.0)
activejob (= 6.1.0)
activemodel (= 6.1.0)
activerecord (= 6.1.0)
activestorage (= 6.1.0)
activesupport (= 6.1.0)
rails (6.1.3.1)
actioncable (= 6.1.3.1)
actionmailbox (= 6.1.3.1)
actionmailer (= 6.1.3.1)
actionpack (= 6.1.3.1)
actiontext (= 6.1.3.1)
actionview (= 6.1.3.1)
activejob (= 6.1.3.1)
activemodel (= 6.1.3.1)
activerecord (= 6.1.3.1)
activestorage (= 6.1.3.1)
activesupport (= 6.1.3.1)
bundler (>= 1.15.0)
railties (= 6.1.0)
railties (= 6.1.3.1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -281,9 +290,9 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.1.0)
actionpack (= 6.1.0)
activesupport (= 6.1.0)
railties (6.1.3.1)
actionpack (= 6.1.3.1)
activesupport (= 6.1.3.1)
method_source
rake (>= 0.8.7)
thor (~> 1.0)
Expand All @@ -305,23 +314,23 @@ GEM
chunky_png (~> 1.0)
rqrcode_core (~> 0.2)
rqrcode_core (0.2.0)
rspec-core (3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.0)
rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.0)
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-rails (4.0.2)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-rails (5.0.1)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.10.0)
rspec-support (3.10.2)
ruby-pinyin (0.5.0)
rmmseg-cpp-new (~> 0.3.1)
ruby2_keywords (0.0.2)
Expand Down Expand Up @@ -362,7 +371,7 @@ GEM
sshkit (1.21.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
thor (1.0.1)
thor (1.1.0)
tilt (2.0.10)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -405,7 +414,7 @@ DEPENDENCIES
letter_opener
logster
marked-rails
mini_racer
mini_racer!
omniauth
omniauth-facebook
omniauth-github
Expand All @@ -425,7 +434,7 @@ DEPENDENCIES
react_on_rails (~> 10)
redis
rqrcode
rspec-rails (~> 4.0.0.beta2)
rspec-rails (~> 5.0.1)
ruby-pinyin
rubyzip (~> 1.3.0)
sass-rails (~> 6.0.0)
Expand Down
Loading