Skip to content

Commit

Permalink
Merge pull request #526 from coopdevs/develop
Browse files Browse the repository at this point in the history 
Release v2.0
  • Loading branch information
@sauloperez
sauloperez authored Dec 4, 2019
2 parents 4d58da4 + 59cc250 commit 69bdf5f
Show file tree
Hide file tree
Showing 18 changed files with 292 additions and 138 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.0
2.6.3
13 changes: 9 additions & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
language: ruby
dist: bionic
cache: bundler
services:
- postgresql
- elasticsearch
addons:
postgresql: "9.4"
chrome: stable
bundler_args: '--without development'
env:
global:
- DATABASE_URL=postgres://postgres@localhost/timeoverflow_test
- CC_TEST_REPORTER_ID=025bc15a0fa9afa52d86ee24fea845cf1d363f48a466bcf2cef8ab80c29acb28
before_install:
- gem install bundler:1.17.3
before_script:
- bundle exec rake db:setup
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand All @@ -14,7 +23,3 @@ before_script:
- sleep 10
after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
services:
- elasticsearch
addons:
chrome: stable
2 changes: 1 addition & 1 deletion Capfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require 'capistrano/deploy'
require 'capistrano/rails'

stage = ARGV.first
if stage == 'staging' # Sorry, production is not ready yet
if stage != 'production' # Sorry, production is not ready yet
require 'capistrano/rbenv'
end

Expand Down
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "rdiscount"
gem 'activeadmin', '~> 1.2.1'
gem 'has_scope'
gem 'pundit', '~> 2.0.0'
gem 'pg', '0.17.1'
gem 'pg', '0.21.0'
gem 'hstore_translate'
gem 'dalli'
gem 'devise', '~> 4.5.0'
Expand Down Expand Up @@ -61,8 +61,8 @@ group :test do
gem 'shoulda-matchers', '~> 3.1.2'
gem 'fabrication'
gem 'faker', '~> 1.9'
gem 'capybara', '~> 3.13'
gem 'selenium-webdriver', '~> 3.141'
gem 'webdrivers', '~> 3.0'
gem 'simplecov', '~> 0.16.1', require: false
gem 'capybara', '~> 3.15'
gem 'selenium-webdriver', '~> 3.142'
gem 'webdrivers', '~> 4.1.2'
gem 'simplecov', '~> 0.17', require: false
end
121 changes: 59 additions & 62 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
actionmailer (4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.11)
actionview (= 4.2.11)
activesupport (= 4.2.11)
actionpack (4.2.11.1)
actionview (= 4.2.11.1)
activesupport (= 4.2.11.1)
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.11)
activesupport (= 4.2.11)
actionview (4.2.11.1)
activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
Expand All @@ -32,17 +32,17 @@ GEM
ransack (~> 1.3)
sass (~> 3.1)
sprockets (< 4.1)
activejob (4.2.11)
activesupport (= 4.2.11)
activejob (4.2.11.1)
activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
activemodel (4.2.11)
activesupport (= 4.2.11)
activemodel (4.2.11.1)
activesupport (= 4.2.11.1)
builder (~> 3.1)
activerecord (4.2.11)
activemodel (= 4.2.11)
activesupport (= 4.2.11)
activerecord (4.2.11.1)
activemodel (= 4.2.11.1)
activesupport (= 4.2.11.1)
arel (~> 6.0)
activesupport (4.2.11)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand Down Expand Up @@ -71,7 +71,7 @@ GEM
builder (3.2.3)
byebug (4.0.5)
columnize (= 0.9.0)
capistrano (3.4.0)
capistrano (3.4.1)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
Expand All @@ -84,16 +84,16 @@ GEM
capistrano-rbenv (2.1.3)
capistrano (~> 3.1)
sshkit (~> 1.3)
capybara (3.13.2)
capybara (3.15.1)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
xpath (~> 3.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
childprocess (1.0.1)
rake (< 13.0)
chronic (0.10.2)
coderay (1.1.2)
coffee-rails (4.1.0)
Expand All @@ -104,7 +104,7 @@ GEM
execjs
coffee-script-source (1.8.0)
columnize (0.9.0)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.5)
connection_pool (2.2.1)
crass (1.0.4)
dalli (2.7.2)
Expand All @@ -117,7 +117,7 @@ GEM
responders
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.3.1)
docile (1.3.2)
domain_name (0.5.20170223)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.1)
Expand Down Expand Up @@ -147,12 +147,11 @@ GEM
i18n (>= 0.7)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
ffi (1.10.0)
formtastic (3.1.5)
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
gli (2.16.0)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
has_scope (0.6.0)
actionpack (>= 3.2, < 5)
Expand Down Expand Up @@ -206,23 +205,22 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.11.2)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
net_http_ssl_fix (0.0.10)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
netrc (0.11.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
parallel (1.12.1)
parser (2.5.0.0)
ast (~> 2.4.0)
pdf-core (0.7.0)
pg (0.17.1)
pg (0.21.0)
polyamorous (1.3.3)
activerecord (>= 3.0)
powerpack (0.1.1)
Expand All @@ -239,16 +237,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.11)
actionmailer (= 4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
activemodel (= 4.2.11)
activerecord (= 4.2.11)
activesupport (= 4.2.11)
rails (4.2.11.1)
actionmailer (= 4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
activemodel (= 4.2.11.1)
activerecord (= 4.2.11.1)
activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.11)
railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -261,14 +259,14 @@ GEM
rails-i18n (4.0.3)
i18n (~> 0.6)
railties (~> 4.0)
railties (4.2.11)
actionpack (= 4.2.11)
activesupport (= 4.2.11)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
raindrops (0.16.0)
rake (12.3.1)
rake (12.3.3)
ransack (1.8.6)
actionpack (>= 3.0)
activerecord (>= 3.0)
Expand All @@ -277,7 +275,7 @@ GEM
polyamorous (~> 1.3.2)
rdiscount (2.1.7.1)
redis (4.0.1)
regexp_parser (1.3.0)
regexp_parser (1.6.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
Expand Down Expand Up @@ -312,7 +310,7 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
rubyzip (1.2.2)
rubyzip (1.2.3)
rufus-scheduler (3.4.2)
et-orbi (~> 1.0)
sass (3.4.21)
Expand All @@ -324,8 +322,8 @@ GEM
tilt (>= 1.1, < 3)
select2-rails (4.0.1)
thor (~> 0.14)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
Expand All @@ -340,7 +338,7 @@ GEM
simple_form (3.1.0)
actionpack (~> 4.0)
activemodel (~> 4.0)
simplecov (0.16.1)
simplecov (0.17.0)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand All @@ -356,7 +354,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.8.1)
sshkit (1.20.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
thor (0.20.3)
Expand All @@ -383,11 +381,10 @@ GEM
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
webdrivers (3.7.2)
net_http_ssl_fix
webdrivers (4.1.2)
nokogiri (~> 1.6)
rubyzip (~> 1.0)
selenium-webdriver (~> 3.0)
selenium-webdriver (>= 3.0, < 4.0)
whenever (0.9.4)
chronic (>= 0.6.3)
xpath (3.2.0)
Expand All @@ -406,7 +403,7 @@ DEPENDENCIES
capistrano (~> 3.1)
capistrano-rails (~> 1.1)
capistrano-rbenv (~> 2.1)
capybara (~> 3.13)
capybara (~> 3.15)
coffee-rails
dalli
database_cleaner (= 1.6.2)
Expand All @@ -423,7 +420,7 @@ DEPENDENCIES
kaminari (~> 1.1.1)
letter_opener (= 1.4.1)
localeapp (= 2.1.1)
pg (= 0.17.1)
pg (= 0.21.0)
prawn (~> 2.2.0)
prawn-table (~> 0.2.2)
pundit (~> 2.0.0)
Expand All @@ -436,21 +433,21 @@ DEPENDENCIES
rufus-scheduler (~> 3.4.2)
sass-rails (~> 5.0.7)
select2-rails
selenium-webdriver (~> 3.141)
selenium-webdriver (~> 3.142)
shoulda-matchers (~> 3.1.2)
sidekiq (= 5.1.3)
sidekiq-cron (= 0.6.3)
simple_form (>= 3.0.0)
simplecov (~> 0.16.1)
simplecov (~> 0.17)
skylight
uglifier (= 2.7.2)
unicorn
web-console (= 2.1.3)
webdrivers (~> 3.0)
webdrivers (~> 4.1.2)
whenever

RUBY VERSION
ruby 2.3.0p0
ruby 2.6.3p62

BUNDLED WITH
1.16.2
1.17.3
6 changes: 5 additions & 1 deletion config/database.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defaults: &defaults
collation: 'es_ES.UTF-8'
ctype: 'es_ES.UTF-8'
template: 'template0'
encoding: utf8
encoding: 'UTF8'

development:
<<: *defaults
Expand All @@ -33,3 +33,7 @@ staging:
production:
# Set DATABASE_URL environment variable
url: <%= ENV['DATABASE_URL'] %>

next:
<<: *defaults
database: <%= ENV.fetch('DATABASE_NAME', 'timeoverflow_production') %>
Loading

0 comments on commit 69bdf5f

Please sign in to comment.