Merge branch 'master' into codecov-travis-tweaks
This commit is contained in:
CactusPuppy
commit
2f0bf822c4
9 changed files with 70 additions and 23 deletions
|
|
@ -1 +1 @@
|
|||
2.5.8
|
||||
2.6.6
|
||||
|
|
|
|||
29
.travis.yml
29
.travis.yml
|
|
@ -1,14 +1,14 @@
|
|||
sudo: required
|
||||
dist: xenial
|
||||
language: ruby
|
||||
cache: bundler
|
||||
rvm:
|
||||
- 2.6.6
|
||||
dist: bionic
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- chromium-browser
|
||||
language: ruby
|
||||
cache: bundler
|
||||
rvm:
|
||||
- 2.5
|
||||
- 2.6
|
||||
services:
|
||||
- postgresql
|
||||
branches:
|
||||
except:
|
||||
- /^depfu/.*$/
|
||||
|
|
@ -26,16 +26,29 @@ notifications:
|
|||
on_success: change
|
||||
on_failure: change
|
||||
before_script:
|
||||
# install CodeClimate test reporter and tell it we are starting a test run
|
||||
# - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $CCTR
|
||||
# - chmod +x $CCTR
|
||||
# - $CCTR before-build
|
||||
- RAILS_ENV=test bundle exec rake db:bootstrap --trace
|
||||
- RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update
|
||||
script:
|
||||
- "./travis_script.sh $TEST_SUITE"
|
||||
- "bin/travis_script.sh $TEST_SUITE"
|
||||
# TODO Get this working.
|
||||
# - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json
|
||||
# after_script:
|
||||
# combine coverage from all suites, and upload3 to CodeClimate
|
||||
# - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage
|
||||
# - $CCTR after-build --exit-code $TRAVIS_TEST_RESULT
|
||||
|
||||
env:
|
||||
global:
|
||||
- OSEM_DB_ADAPTER=sqlite3
|
||||
- OSEM_DB_HOST=''
|
||||
- OSEM_DB_PORT=''
|
||||
- OSEM_DB_NAME='osem_test'
|
||||
- CC_TEST_REPORTER_ID=$CC_TEST_REPORTER
|
||||
- CCTR=./cc-test-reporter
|
||||
matrix:
|
||||
- TEST_SUITE=ability
|
||||
- TEST_SUITE=features
|
||||
|
|
|
|||
4
Gemfile
4
Gemfile
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
source 'https://rubygems.org'
|
||||
|
||||
# ruby '~> 2.5.0'
|
||||
ruby ENV['TRAVIS_RUBY_VERSION'] || '2.6.6'
|
||||
|
||||
# rails-assets requires >= 1.8.4
|
||||
if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')
|
||||
|
|
@ -12,7 +12,7 @@ end
|
|||
gem 'rails', '~> 5.2'
|
||||
|
||||
# Use Puma as the app server
|
||||
gem 'puma', '~> 3.0'
|
||||
gem 'puma', '~> 5.2'
|
||||
|
||||
# respond_to methods have been extracted to the responders gem
|
||||
# http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#responders
|
||||
|
|
|
|||
23
Gemfile.lock
23
Gemfile.lock
|
|
@ -126,10 +126,9 @@ GEM
|
|||
cloudinary (1.11.1)
|
||||
aws_cf_signer
|
||||
rest-client
|
||||
cocoon (1.2.14)
|
||||
codecov (0.2.11)
|
||||
json
|
||||
simplecov
|
||||
cocoon (1.2.15)
|
||||
codecov (0.5.0)
|
||||
simplecov (>= 0.15, < 0.22)
|
||||
coderay (1.1.1)
|
||||
concurrent-ruby (1.1.8)
|
||||
countable-rails (0.0.1)
|
||||
|
|
@ -162,7 +161,7 @@ GEM
|
|||
devise_ichain_authenticatable (0.3.2)
|
||||
devise (>= 2.2)
|
||||
diff-lcs (1.3)
|
||||
docile (1.3.2)
|
||||
docile (1.3.5)
|
||||
domain_name (0.5.20180417)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (2.7.5)
|
||||
|
|
@ -270,7 +269,7 @@ GEM
|
|||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (6.0.1)
|
||||
railties (>= 3.2.16)
|
||||
json (2.3.1)
|
||||
json (2.5.1)
|
||||
json-schema (2.8.1)
|
||||
addressable (>= 2.4)
|
||||
jsonapi-renderer (0.2.2)
|
||||
|
|
@ -421,7 +420,8 @@ GEM
|
|||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
public_suffix (3.1.1)
|
||||
puma (3.12.6)
|
||||
puma (5.2.1)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
rack-openid (1.3.1)
|
||||
|
|
@ -592,10 +592,12 @@ GEM
|
|||
shellany (0.0.1)
|
||||
shoulda-matchers (4.1.2)
|
||||
activesupport (>= 4.2.0)
|
||||
simplecov (0.19.0)
|
||||
simplecov (0.21.2)
|
||||
docile (~> 1.1)
|
||||
simplecov-html (~> 0.11)
|
||||
simplecov_json_formatter (~> 0.1)
|
||||
simplecov-html (0.12.3)
|
||||
simplecov_json_formatter (0.1.2)
|
||||
sixarm_ruby_unaccent (1.2.0)
|
||||
skylight (3.1.5)
|
||||
skylight-core (= 3.1.5)
|
||||
|
|
@ -744,7 +746,7 @@ DEPENDENCIES
|
|||
pronto-haml
|
||||
pronto-rubocop
|
||||
pry
|
||||
puma (~> 3.0)
|
||||
puma (~> 5.2)
|
||||
rails (~> 5.2)
|
||||
rails-assets-bootstrap-markdown!
|
||||
rails-assets-bootstrap-select!
|
||||
|
|
@ -792,5 +794,8 @@ DEPENDENCIES
|
|||
webmock
|
||||
whenever
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.6.6p146
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.3
|
||||
|
|
|
|||
17
README.md
17
README.md
|
|
@ -1,3 +1,4 @@
|
|||
### Spring 2021 Student Project
|
||||
[](https://travis-ci.com/CactusPuppy/snapcon)
|
||||
[](https://codeclimate.com/github/CactusPuppy/snapcon/maintainability)
|
||||
[](https://codecov.io/gh/CactusPuppy/snapcon)
|
||||
|
|
@ -13,7 +14,21 @@
|
|||
<img src="https://www.pivotaltracker.com/marketing_assets/shared_home/tracker-4679313e699d9ba696371344953de96c81d207d967a43f121d353391c81c9ba7.svg" height="20px" alt="Pivotal Tracker">
|
||||
</a>
|
||||
|
||||
# Open Source Event Manager - [osem.io](https://osem.io)
|
||||
---
|
||||
|
||||
[](https://travis-ci.com/snap-cloud/snapcon)
|
||||
[](https://codeclimate.com/github/snap-cloud/snapcon/maintainability)
|
||||
[](https://codeclimate.com/github/snap-cloud/snapcon/test_coverage)
|
||||
[](https://codecov.io/gh/snap-cloud/snapcon)
|
||||
[](https://hakiri.io/github/snap-cloud/snapcon/master)
|
||||
[](https://depfu.com/repos/snap-cloud/snapcon)
|
||||
<a href="https://heroku.com/deploy?template=https://github.com/snap-cloud/snapcon/tree/v1.0">
|
||||
<img src="https://www.herokucdn.com/deploy/button.svg" height="20px" alt="Deploy">
|
||||
</a>
|
||||
|
||||
# [Snap!Con](https://snapcon.org)
|
||||
forked from:
|
||||
## Open Source Event Manager - [osem.io](https://osem.io)
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
|
||||
#splash {
|
||||
// Counter the general padding for #content
|
||||
margin-bottom: -60px;
|
||||
margin-bottom: -65px;
|
||||
|
||||
section {
|
||||
padding-top: 60px;
|
||||
padding-bottom: 60px;
|
||||
|
|
@ -144,6 +145,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.social-media.trapezoid {
|
||||
border-top-color: #0C3559; // TODO: Use @conference color?
|
||||
}
|
||||
|
||||
#social-media{
|
||||
background: none repeat scroll 0 0 #0C3559;
|
||||
padding: 50px 20px;
|
||||
|
|
|
|||
|
|
@ -27,4 +27,4 @@
|
|||
- if contact.email?
|
||||
= mail_to "#{ contact.email }" do
|
||||
%i.fa.fa-envelope-o.fa-4x
|
||||
.trapezoid
|
||||
.trapezoid.social-media
|
||||
|
|
|
|||
|
|
@ -1,4 +1,13 @@
|
|||
Sentry.init do |config|
|
||||
config.enabled_environments = %|production staging|
|
||||
config.dsn = ENV['SENTRY_DSN']
|
||||
config.breadcrumbs_logger = [:active_support_logger]
|
||||
|
||||
# To activate performance monitoring, set one of these options.
|
||||
# We recommend adjusting the value in production:
|
||||
config.traces_sample_rate = 0.5
|
||||
# or
|
||||
# config.traces_sampler = lambda do |context|
|
||||
# true
|
||||
# end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue