Merge branch 'prepare-for-gh' into 'master'

Prepare for GitHub

See merge request nilsding/retrospring!76

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+team@retrospring.net.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -1,12 +1,18 @@
 # Contributing
 
-Thank you for reading this! This document has some notes on contributing to the development of Retrospring.
+Thank you for reading this! This document has some notes on contributing to the
+development of Retrospring.
 
 ## Reporting bugs
 
-Before submitting an issue please check if there is already an existing issue. If there is, please add any additional information or give it a "+1" in the comments.
+Before submitting an issue please check if there is already an existing issue.
+If there is, please add any additional information or give it a "+1" in the
+comments.
 
-When submitting an issue please describe the issue clearly, including how to reproduce the bug, which situations it appears in, what you expect to happen, what actually happens, and what platform (browser and operating system) you are using.  We find screenshots (for front-end issues) very helpful.
+When submitting an issue please describe the issue clearly, including how to
+reproduce the bug, which situations it appears in, what you expect to happen,
+what actually happens, and what platform (browser and operating system) you are
+using.  We find screenshots (for front-end issues) very helpful.
 
 ## Pull Requests
 
@@ -16,13 +22,18 @@ When submitting an issue please describe the issue clearly, including how to rep
 4. Push to the branch (`git push origin feature-new`)
 5. Create a new Pull Request
 
-We love pull requests! We are very happy to work with you to get your changes merged in, however please keep the following in mind.
+We love pull requests! We are very happy to work with you to get your changes
+merged in, however please keep the following in mind.
 
 * Please use the core team standard of `feature-*` branch naming.
 * Adhere to the coding conventions you see in the surrounding code.
 * If you include a new feature also include tests, and make sure they'll pass.
-* Before submitting a pull-request, clean up the history by going over your commits and squashing together minor changes and fixes into the corresponding commits. You can do this using the interactive rebase command.
+* Before submitting a pull-request, clean up the history by going over your
+  commits and squashing together minor changes and fixes into the corresponding
+  commits. You can do this using the interactive rebase command.
 
 ## What to work on
 
-If you want to know what you can help us with, like new features, check the Github issues or the [TODO](https://github.com/Retrospring/retrospring/blob/master/TODO).
+If you want to know what you can help us with, like new features, check the
+GitHub issues or the
+[TODO](https://github.com/Retrospring/retrospring/blob/master/TODO).

CONTRIBUTORS.txt

@@ -1,10 +0,0 @@
-List of contributors, format is "Name @github <email>"
-
-Andreas N. @pixeldesu
-Georg G. @nilsding
-Yuki @yukimono
-Adel D.-K.
-Howl
-Iain D.
-Jona H. @schisma @ix
-Robin B.

Capfile

@@ -1,18 +0,0 @@
-# Load DSL and set up stages
-require "capistrano/setup"
-
-# Include default deployment tasks
-require "capistrano/deploy"
-
-# Load the SCM plugin
-require "capistrano/scm/git"
-install_plugin Capistrano::SCM::Git
-
-# Include tasks from other gems included in your Gemfile
-#require "rvm1/capistrano3"
-require "capistrano/bundler"
-require "capistrano/rails/assets"
-require "capistrano/rails/migrations"
-
-# Load custom tasks from `lib/capistrano/tasks` if you have any defined
-Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }

Gemfile

@@ -82,17 +82,6 @@ group :development do
   gem 'web-console', '< 4.0.0'
 end
 
-# Deployment
-group :development do
-  gem 'capistrano', '~> 3.8', require: false
-  gem 'capistrano-rails', require: false
-
-  gem 'rbnacl', '>= 3.2', '< 5.0', require: false
-  gem 'rbnacl-libsodium', require: false
-  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false
-  gem 'ed25519', require: false
-end
-
 group :production do
   gem 'unicorn', group: :production
 end

Gemfile.lock

@@ -67,13 +67,10 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    airbrussh (1.4.0)
-      sshkit (>= 1.6.1, != 1.7.0)
     arel (9.0.0)
     autoprefixer-rails (9.7.6)
       execjs
     bcrypt (3.1.13)
-    bcrypt_pbkdf (1.0.1)
     better_errors (2.6.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
@@ -93,16 +90,6 @@ GEM
     buftok (0.2.0)
     builder (3.2.4)
     byebug (11.1.2)
-    capistrano (3.13.0)
-      airbrussh (>= 1.0.0)
-      i18n
-      rake (>= 10.0.0)
-      sshkit (>= 1.9.0)
-    capistrano-bundler (1.6.0)
-      capistrano (~> 3.1)
-    capistrano-rails (1.4.0)
-      capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
     capybara (3.32.1)
       addressable
       mini_mime (>= 0.1.3)
@@ -144,7 +131,6 @@ GEM
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ed25519 (1.2.4)
     equalizer (0.0.11)
     erubi (1.9.0)
     excon (0.73.0)
@@ -291,9 +277,6 @@ GEM
     naught (1.1.0)
     nenv (0.3.0)
     nested_form (0.3.2)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
     newrelic_rpm (6.10.0.364)
     nio4r (2.5.2)
     nokogiri (1.10.9)
@@ -392,10 +375,6 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbnacl (4.0.2)
-      ffi
-    rbnacl-libsodium (1.0.16)
-      rbnacl (>= 3.0.1)
     redcarpet (3.5.0)
     redis (4.1.3)
     regexp_parser (1.7.0)
@@ -468,9 +447,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.21.0)
-      net-scp (>= 1.1.2)
-      net-ssh (>= 2.8.0)
     sweetalert-rails (1.1.3)
       railties (>= 3.1.0)
     temple (0.8.2)
@@ -525,7 +501,6 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt (~> 3.1.7)
-  bcrypt_pbkdf (>= 1.0, < 2.0)
   better_errors
   bootstrap-sass (~> 3.4.0)
   bootstrap3-datetimepicker-rails (~> 4.7.14)
@@ -533,8 +508,6 @@ DEPENDENCIES
   bootswatch-rails
   brakeman
   byebug
-  capistrano (~> 3.8)
-  capistrano-rails
   capybara
   coffee-rails (~> 4.1)
   colorize
@@ -543,7 +516,6 @@ DEPENDENCIES
   devise (~> 4.0)
   devise-async
   devise-i18n
-  ed25519
   factory_bot_rails
   fake_email_validator
   faker
@@ -580,8 +552,6 @@ DEPENDENCIES
   rails-i18n (~> 5.0)
   rails_admin
   rake
-  rbnacl (>= 3.2, < 5.0)
-  rbnacl-libsodium
   redcarpet
   redis
   rspec-rails (~> 3.9)

README.md

@@ -1,16 +1,23 @@
-# Retrospring [![Build Status](https://travis-ci.org/Retrospring/retrospring.svg)](https://travis-ci.org/Retrospring/retrospring)
+# Retrospring
 
-This is the source code that powers Retrospring. This is a detached fork of [nilsding/justask](https://github.com/nilsding/justask), where we continue development.
+This is the source code that powers Retrospring. This is a detached fork of
+[nilsding/justask](https://github.com/nilsding/justask), where we continue
+development.
 
-Retrospring shut down on June 12, 2016. The source code will continue to be hosted here, as though no further updates will be made to it (there weren't any to begin with, though).
+Retrospring shut down on June 12, 2016, but it's somehow still alive.  You're
+welcome.
 
 ## Installation
 
-You can find all the installation instructions needed for a local/production setup of Retrospring in the [Wiki](https://github.com/Retrospring/retrospring/wiki/Setup)!
+You can find all the installation instructions needed for a local/production
+setup of Retrospring in the
+[Wiki](https://github.com/Retrospring/retrospring/wiki/Setup).
 
 ## Contributing
 
-Guidelines for Pull Requests and general information about how you can help us improving Retrospring can be found [here](https://github.com/Retrospring/retrospring/blob/master/CONTRIBUTING.md)! 
+Guidelines for Pull Requests and general information about how you can help us
+improving Retrospring can be found
+[here](https://github.com/Retrospring/retrospring/blob/master/CONTRIBUTING.md).
 
 ## License
 

app/views/shared/_links.html.haml

@@ -5,7 +5,7 @@
   ·
   = link_to t('views.general.about'), about_path
   ·
-  = link_to "Github", 'https://github.com/retrospring/retrospring'
+  = link_to "GitHub", 'https://github.com/retrospring/retrospring'
   ·
   = link_to t('views.general.terms'), terms_path
   ·

config/deploy.rb

@@ -1,43 +0,0 @@
-# config valid only for current version of Capistrano
-lock "3.13.0"
-
-set :application, "retrospring"
-set :repo_url, "git@git.rrerr.net:nilsding/retrospring.git"
-
-# Default branch is :master
-ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
-
-# Default deploy_to directory is /var/www/my_app_name
-set :deploy_to, "/home/justask/apps/retrospring"
-
-# Default value for :format is :airbrussh.
-# set :format, :airbrussh
-
-# You can configure the Airbrussh format using :format_options.
-# These are the defaults.
-# set :format_options, command_output: true, log_file: "log/capistrano.log", color: :auto, truncate: :auto
-
-# Default value for :pty is false
-# set :pty, true
-
-# Default value for :linked_files is []
-append :linked_files, "config/database.yml", "config/justask.yml", "config/secrets.yml", "config/unicorn.rb",
-                      "config/newrelic.yml", "config/initializers/devise.rb"
-
-# Default value for linked_dirs is []
-append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/uploads", "public/system", "public/exports"
-
-# Default value for default_env is {}
-# set :default_env, { path: "/opt/ruby/bin:$PATH" }
-
-# Default value for keep_releases is 5
-# set :keep_releases, 5
-
-# Ruby version / RVM
-set :rvm1_ruby_version, '2.3.3@retrospring'
-
-# Create JS i18n files before precompiling assets
-before 'deploy:assets:precompile', 'deploy:i18n_js'
-
-# Restart the app server after successful deploy
-after 'deploy:cleanup', 'deploy:restart'

config/deploy/production.rb

@@ -1,39 +0,0 @@
-# Defines a single server with a list of roles and multiple properties.
-server "retrospring-001.aws.infra.retrospring.net", user: "justask", roles: %w{app db web}
-
-# Configuration
-# =============
-# You can set any configuration variable like in config/deploy.rb
-# These variables are then only loaded and set in this stage.
-# For available Capistrano configuration variables see the documentation page.
-# http://capistranorb.com/documentation/getting-started/configuration/
-# Feel free to add new variables to customise your setup.
-
-set :rails_env, :production
-
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult the Net::SSH documentation.
-# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# The server-based syntax can be used to override options:
-# ------------------------------------
-# server "example.com",
-#   user: "user_name",
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: "user_name", # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: "please use keys"
-#   }

lib/capistrano/tasks/i18n.rake

@@ -1,11 +0,0 @@
-namespace :deploy do
-  task :i18n_js do
-    on roles(:all) do
-      within release_path do
-        with rails_env: fetch(:rails_env), rails_groups: fetch(:rails_assets_groups) do
-          execute :rake, "i18n:js:export"
-        end
-      end
-    end
-  end
-end

lib/capistrano/tasks/restart.rake

@@ -1,38 +0,0 @@
-namespace :deploy do
-  task :start do
-    on roles(:all) do
-puts "------- skip start"
-next
-      rvm_prefix = "#{fetch(:rvm1_auto_script_path)}/rvm-auto.sh #{fetch(:rvm1_ruby_version)}"
-      execute :tmux, 'new-session',
-              '-d',
-              '-s', 'retrospring',
-              '-n', 'retrospring',
-              '-c', '/usr/home/justask/apps/retrospring/current',
-              "'#{rvm_prefix} bundle exec foreman start'"
-    end
-  end
-
-  task :stop do
-    on roles(:all) do
-puts "------- skip stop"
-next
-      execute :sh, '-c', '\'tmux list-panes -t retrospring -F "#{pane_pid}" | xargs kill\''
-    end
-  end
-
-  desc 'Restart the server'
-  task :restart do
-    on roles(:all) do
-puts "------- skip restart"
-next
-      info 'Restarting application server'
-      invoke('deploy:stop')
-
-      info 'Waiting 5 seconds'
-      sleep 5
-
-      invoke('deploy:start')
-    end
-  end
-end