diff --git a/.ruby-version b/.ruby-version index ecd7ee50..338a5b5d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.8 +2.6.6 diff --git a/.travis.yml b/.travis.yml index 6d3ac828..a94c68ef 100644 --- a/.travis.yml +++ b/.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 diff --git a/Gemfile b/Gemfile index 77ac5a7e..3bca5dfc 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 296eb96c..b07d289e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,9 +127,8 @@ GEM aws_cf_signer rest-client cocoon (1.2.14) - codecov (0.2.11) - json - simplecov + 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 diff --git a/README.md b/README.md index 09356477..71f3ac37 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +### Spring 2021 Student Project [![Build Status](https://travis-ci.com/CactusPuppy/snapcon.svg?branch=master)](https://travis-ci.com/CactusPuppy/snapcon) [![Maintainability](https://api.codeclimate.com/v1/badges/6c7fc446b3b10866ba71/maintainability)](https://codeclimate.com/github/CactusPuppy/snapcon/maintainability) [![codecov](https://codecov.io/gh/CactusPuppy/snapcon/branch/master/graph/badge.svg?token=y4aEAtw6KJ)](https://codecov.io/gh/CactusPuppy/snapcon) @@ -13,7 +14,21 @@ Pivotal Tracker -# Open Source Event Manager - [osem.io](https://osem.io) +--- + +[![Build Status](https://travis-ci.com/snap-cloud/snapcon.svg?branch=master)](https://travis-ci.com/snap-cloud/snapcon) +[![Maintainability](https://api.codeclimate.com/v1/badges/b7b0d559a03bf218663a/maintainability)](https://codeclimate.com/github/snap-cloud/snapcon/maintainability) +[![Test Coverage](https://api.codeclimate.com/v1/badges/b7b0d559a03bf218663a/test_coverage)](https://codeclimate.com/github/snap-cloud/snapcon/test_coverage) +[![codecov](https://codecov.io/gh/snap-cloud/snapcon/branch/master/graph/badge.svg)](https://codecov.io/gh/snap-cloud/snapcon) +[![Security Status](https://hakiri.io/github/snap-cloud/snapcon/master.svg)](https://hakiri.io/github/snap-cloud/snapcon/master) +[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/snap-cloud/snapcon) + + Deploy + + +# [Snap!Con](https://snapcon.org) +forked from: +## Open Source Event Manager - [osem.io](https://osem.io) ![OSEM Logo](doc/osem-logo.png) diff --git a/app/assets/stylesheets/osem-splash.scss b/app/assets/stylesheets/osem-splash.scss index e2bdda65..09e8a31d 100644 --- a/app/assets/stylesheets/osem-splash.scss +++ b/app/assets/stylesheets/osem-splash.scss @@ -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; diff --git a/app/views/conferences/_social_media.haml b/app/views/conferences/_social_media.haml index ebbfb8e1..0f73e46a 100644 --- a/app/views/conferences/_social_media.haml +++ b/app/views/conferences/_social_media.haml @@ -27,4 +27,4 @@ - if contact.email? = mail_to "#{ contact.email }" do %i.fa.fa-envelope-o.fa-4x - .trapezoid + .trapezoid.social-media diff --git a/travis_script.sh b/bin/travis_script.sh similarity index 100% rename from travis_script.sh rename to bin/travis_script.sh diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index e42fcce6..a94cc79a 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -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