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
5 changes: 0 additions & 5 deletions .dockerignore

This file was deleted.

31 changes: 1 addition & 30 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,12 @@ on:
workflow_dispatch:

jobs:
docker_publish:
needs: deploy

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: standardnotes/listed
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
tags: "latest,${{ github.sha }}"

deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
- uses: actions/cache@v2
with:
path: vendor/bundle
Expand Down Expand Up @@ -62,20 +44,9 @@ jobs:
LISTED_SSH_SERVER: ${{ secrets.LISTED_SSH_SERVER_DEV }}
LISTED_SSH_DEPLOY_TO: ${{ secrets.LISTED_SSH_DEPLOY_TO_DEV }}

notify_discord:
needs: deploy

runs-on: ubuntu-latest

steps:
- name: Run Discord Webhook
uses: johnnyhuy/actions-discord-git-webhook@main
with:
webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}

code_scanning:
runs-on: ubuntu-latest

continue-on-error: true
steps:
- uses: actions/checkout@v2
- name: Runs Brakeman vulnerability scanner
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ name: PR

on:
pull_request:
branches: [ develop ]
branches: [ master ]

jobs:
test:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Runs Brakeman vulnerability scanner
Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,12 @@ on:
workflow_dispatch:

jobs:
docker_publish:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: standardnotes/listed
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
tags: "stable,${{ github.sha }}"

deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
- uses: actions/cache@v2
with:
path: vendor/bundle
Expand Down Expand Up @@ -59,14 +43,3 @@ jobs:
LISTED_SSH_USER: ${{ secrets.LISTED_SSH_USER_PROD }}
LISTED_SSH_SERVER: ${{ secrets.LISTED_SSH_SERVER_PROD }}
LISTED_SSH_DEPLOY_TO: ${{ secrets.LISTED_SSH_DEPLOY_TO_PROD }}

notify_discord:
needs: deploy

runs-on: ubuntu-latest

steps:
- name: Run Discord Webhook
uses: johnnyhuy/actions-discord-git-webhook@main
with:
webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.18.2
16.15.1
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.6
52 changes: 0 additions & 52 deletions Dockerfile

This file was deleted.

76 changes: 31 additions & 45 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,67 +5,53 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem 'rails', '= 5.2.5'
gem 'mysql2'
gem 'puma', '~> 4.3'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'safe_yaml'
gem 'dotenv-rails', '~> 2.7.6'
gem 'sanitize'
gem 'rouge'
gem 'haml-rails'
gem 'whenever'
gem 'redcarpet'
gem 'mini_racer', platforms: :ruby
gem 'mysql2', '>= 0.3.13', '< 0.5'
gem 'puma', '~> 4.3'
gem 'rack-cors', :require => 'rack/cors'
gem 'rails', '= 5.2.5'
gem 'react_on_rails', '11.3'
gem 'redcarpet'
gem 'rouge'
gem 'safe_yaml'
gem 'sanitize'
gem 'sass-rails', '~> 5.0'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'uglifier', '>= 1.3.0'
gem 'webpacker', '~> 4'
gem 'whenever'
gem "aws-sdk-acm", "~> 1.34"
gem "aws-sdk-elasticloadbalancingv2", "~> 1.47"
gem "aws-sdk-route53", "~> 1.40"
gem "aws-sdk-sns", "~> 1.49"
gem "aws-sdk-sqs", "~> 1.48"
gem "capistrano-shoryuken", "~> 0.1.5"
gem "lograge", "~> 0.11.2"
gem "newrelic_rpm", "= 8.2.0"
gem "newrelic-infinite_tracing", "= 8.2.0"
gem "rails-letsencrypt", "~> 0.9.0"
gem "shoryuken", "~> 5.3"

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.0.5'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'rb-readline'
# Deployment tools
gem 'capistrano'
gem 'brakeman'
gem 'capistrano-bundler'
gem 'capistrano-git-submodule-strategy', '~> 0.1.22'
gem 'capistrano-passenger', '>= 0.2.0'
gem 'capistrano-rails'
gem 'capistrano-rvm'
gem 'capistrano-sidekiq'
gem 'capistrano-git-submodule-strategy', '~> 0.1.22'
gem 'capistrano'
gem 'listen', '~> 3.0.5'
gem 'rb-readline'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'spring'
gem 'web-console', '>= 3.3.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'mini_racer', platforms: :ruby


gem "rails-letsencrypt", "~> 0.9.0"

gem "aws-sdk-acm", "~> 1.34"

gem "aws-sdk-elasticloadbalancingv2", "~> 1.47"

gem "lograge", "~> 0.11.2"

gem "aws-sdk-route53", "~> 1.40"

gem "newrelic_rpm", "= 8.2.0"

gem "newrelic-infinite_tracing", "= 8.2.0"

gem "shoryuken", "~> 5.3"

gem "capistrano-shoryuken", "~> 0.1.5"

gem "aws-sdk-sqs", "~> 1.48"

gem "aws-sdk-sns", "~> 1.49"
Loading