Skip to content

Commit 2157c4d

Browse files
authored
Merge pull request #680 from coopdevs/develop
2 parents 5ffa624 + e6208cf commit 2157c4d

File tree

103 files changed

+1840
-665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1840
-665
lines changed

.github/workflows/ci.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
services:
9+
postgres:
10+
image: postgres:9.4
11+
ports: ["5432:5432"]
12+
env:
13+
POSTGRES_USER: postgres
14+
POSTGRES_PASSWORD: postgres
15+
POSTGRES_DB: timeoverflow_test
16+
steps:
17+
- uses: actions/checkout@v3
18+
- name: Set up Ruby
19+
uses: ruby/setup-ruby@v1
20+
with:
21+
bundler-cache: true
22+
- name: Run tests
23+
env:
24+
RAILS_ENV: test
25+
POSTGRES_USER: postgres
26+
POSTGRES_PASSWORD: postgres
27+
run: |
28+
bundle exec rails db:setup
29+
bundle exec rspec
30+
- name: Publish code coverage
31+
uses: paambaati/codeclimate-action@v3.2.0
32+
env:
33+
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
34+
with:
35+
coverageLocations: ${{ github.workspace }}/coverage/coverage.json:simplecov

.travis.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

Gemfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
source 'https://rubygems.org'
22

3-
ruby File.read('.ruby-version').strip
4-
53
gem 'rails', '~> 6.1.1'
64
gem 'rails-i18n', '~> 6.0.0'
7-
gem 'rdiscount', '~> 2.2.0.1'
5+
gem 'rdiscount', '~> 2.2.7'
86
gem 'rubyzip', '~> 2.3.0'
97
gem 'activeadmin', '~> 2.9.0'
10-
gem 'bootsnap', '~> 1.7.3', require: false
8+
gem 'bootsnap', '~> 1.12.0', require: false
119
gem 'has_scope', '~> 0.7.2'
1210
gem 'pundit', '~> 2.1.0'
13-
gem 'pg', '~> 1.2.1'
11+
gem 'pg', '~> 1.4'
1412
gem 'json_translate', '~> 4.0.0'
15-
gem 'devise', '~> 4.7.1'
13+
gem 'devise', '~> 4.9.1'
14+
gem 'devise-i18n', '~> 1.11.0'
1615
gem 'http_accept_language', '~> 2.1.1'
1716
gem 'unicorn', '~> 5.5.1'
1817
gem 'kaminari', '~> 1.2.1'
@@ -22,10 +21,10 @@ gem 'prawn', '~> 2.4.0'
2221
gem 'prawn-table', '~> 0.2.2'
2322
gem 'pg_search', '~> 2.3.5'
2423
gem 'skylight', '~> 5.0'
25-
gem 'sidekiq', '~> 6.1.2'
24+
gem 'sidekiq', '~> 6.4.0'
2625
gem 'sidekiq-cron', '~> 1.2.0'
2726
gem 'aws-sdk-s3', '~> 1.94', require: false
28-
gem 'image_processing', '~> 1.2'
27+
gem 'image_processing', '~> 1.12'
2928

3029
# Assets
3130
gem 'jquery-rails', '~> 4.3.5'
@@ -36,7 +35,7 @@ gem 'select2-rails', '~> 4.0.13'
3635

3736
group :development do
3837
gem 'listen', '~> 3.2.0'
39-
gem 'localeapp', '~> 3.1', require: false
38+
gem 'localeapp', '~> 3.3', require: false
4039
gem 'letter_opener', '~> 1.7.0'
4140
gem 'web-console', '~> 4.1.0'
4241
gem 'capistrano', '~> 3.1'

0 commit comments

Comments
 (0)